cleaning up tests, moving to munit