more integration test updates