Fix up a couple of tests