PSR2 related fixes for the test suite
Merge pull request #26 from aik099/psr2-testsuite-fixes

PSR2 related fixes for the test suite