More integration test separation