rename test cases & cleanup dependencies