Fixes for PHP 5.5 (release candidate)
Adjusted test cases