better generated tests + generation cleanup + cs fix