Integration test fixes / cleanups