chore(gen): removing util.inherits and fixing tests