Minor re-organization of test cases