updates main, refactor generateMap, and consumeMap
updates makefile removing non-applicable test-cenario