Updated for dependency changes in integration tests