update generator to 0.17.0 and testing

Only includes some testing updates
Merge pull request #372 from eddiemonge/testing

update generator to 0.17.0-pre.4 and testing