Fixed for Symfony2.3 support and fixed the tests passing