Fix up tests for #13594