Further refinements to test case