Got the integration tests working with the new code.