Fix up tests for #1159.