[D46][Refactor] (BJ, CP) Refactored Testsuite code
[D46][Refactor] (BJ, CP) Refactored Testcase codes