Finished tests for map. Found a couple bugs that contribute to #17.