More clean up and testing