Make tests pass with Symfony 2.3