Some changes for measurements - fix me
Changes in enumerators and additions

Added some factory methods in enumerators. Changed benchmarks. Added tests.