Tests: post-merge review comments for https://gerrit.fd.io/r/#/c/18081/