Tests cleanup
PSR4
Closes #2