ACCESS-114: Fix TestMovingToProduction