Fix the testcases for the previous patch.