Cleanup integration tests a bit