Cleanup + starting tests