cleanup and fix every test for the next iteration release