Fix tests that were broken due to the merge of 1.19.1.