Cleanup tests and move to tasty