Cleanup
Fixed tests for PHP < 5.4