Clean-up and testing