cleaned up test cases