add/clean up test cases
more tests