cleanup and test case added