Updated refactoring for test case to prepare for Externalization test cases