added gentests, fixup3