added gentests, fixup4