5.3 tests won't support using PHPUnit classes as mocks
Fixing minor PSR2 CS issues in the test suite