Test teardown

Cleanup before the tests are run

Also, based upon #16, so merge that one first