Fix unit test failure due to code move