removed generated comments, fixed test