Test fixes for PHP < 5.3