PSR-2 fixes for unit-tests