Test refactorings
Test refactorings
Another test
Refuctorings
Refactored last Tests
PSR2
Minor clean up