Shell clean up and Test case