fixup tests