Many changes and clean up to publish this to Travis
Simple generator test