Remote test fix

Fixes intermittent test failures.