clean-up test cases a bit