Improve some integration test performance / reliability