regeneration flags added to collection/resource. test added for resource
added test for collection as well
Merge branch 'feature/regen' into develop
Merge branch 'develop'