fix code generation and comment failing test due to comparsary fields ma...

...de optional for first data collection