Updates to test with latest version of Symfony