Simplified changes to original testcase.