Ability to change map dynamically
Adding missing test
Added coverage calculation