Lots of work on improving testcoverage of idgenerator
Initial work on idgenerator cleanup
Minor cleanup in IdGenerator
Merge pull request #1646 from pveentjer/coverage/idgenerator

Coverage/idgenerator