Improvements to tests -- added cleanup functions to fixtures