Fix another issue that causes tests fail to run.