Improved tests and bundle to make them work with Symfony 2.5 (WIP)