latest changes to fix the integration tests