Address comments from code review.

3 jobs for refactor-tests in 6 minutes and 30 seconds (queued for 3 seconds)