For this test and others introduced in this PR.