modified use_generator to have tupples as options, all predefined
Merge branch 'use_generator_simple' into unit_tests
added tests to use_generator and removed unnused methods