Factored the test init + added cleanup after tests