cleanup and relax test cases