PRD-4921 - Fast export mode (bi-server test fixes)