Fix unit test after last() changed behavior
Add and clarify unit tests in map
Merge pull request #471 from benjchristensen/error-handling

Unit Test Tweaks