fixed issues with pear upgrade and breaking tests