Add more test cases, teardown cleanly