Improvements to integration tests