Tests PSR compatible

I have adapted the test suite to be PSR compatible