Added MutableMap

Refactor most of the unit tests.