Cleanup and migration to minitest