Add a map test
Initial map implementation
Test map
Implement Map