Additional PHP 5.3 compatibility fixes in tests