added gentests, fixup