Updated the tests to follow the psr coding standards