Fix for test cases.