Some cleaning and testing done!