rename test cases & cleanup