add testcase for previous change and cleanup tests