LP-51 : move method & class, changes in testcase