Clean up setup of tests and coverage