Intermittent test fixes