One more try on fixing broken test case.