Updated tests for Symfony 2.4 (and possibly older)