Additional PHP 5.3 fixes with updated tests