Made the tests PSR-2 compliant