Added Test and Cleaning