Fix another issue that causes tests fail to run.
Merge branch 'test_cases'