Don't rely on setTimeout bugs + test cleanup