Clean tests, use a test helper file