fixup tests after the last few changes