Improved the UMap, added more tests.