cleaning up and writing performance tests