Fixes for integration test after moving out of cumulus package.