Minor code style fixes in tests
PHP 5.3 compatibility in tests