Address code review comments.

1 job for use-arrange-act-assert-pattern-in-more-tests in 11 minutes and 3 seconds (queued for 3 seconds)