Fix unit tests to match Symfony 2.2