PSR2 related fixes for the test suite

This is 2nd part of PSR2 related fixes. This time it's for test suite.

I've executed `/test/test.php` to verify, that test still are passing even after these changes.