fix (work around) intermittent test failures