Compatibility fixes for Symfony 2.6 and general improvement
Improves tests