added more invalid generator models that must be ignored
refactored code
added test for GitHub issue #20