fixup tests a bit