minor cleanup in test, add clean dir in teardown, test suite working