Testcase refactored for PSR2 conding standard