Making test directory PSR2 compliant