Adjust unit test case for