tiding up test cases