cleaned up test cases a little