Fix up more tests