Clean up some integration tests and add some timings