fixup some tests