More clean-up and performance tests work now