added gentests, fixup2