Fix Intermittently Failing Test