Fixed PSR2 Issues for tests