Tried cleaning up test cases