Fixing issues in generator, unit tests, and documentation

Change-Id: I2ed96e1592eb1f62fce63d5607831903323b1826

Fixed some pep8 issues

Change-Id: I31cdc81469db4a5ed3684b5d22daa91a56ff7688