- cleaned up the tests
- small change to the Mapper interface