Fix up some more tests