Fixed mapping tests to only check for subset values.
Closes #30.