Tidy up test cases a little.