"Fix" a flaky test and cleanup an unused import.