Further PSR2 Refactorings
Archieve old tests