Improved integration test setup.