Merge pull request #14 from greenrd/master

Fixes
Test for mapping returning a null, not an empty string. Fixes #13.