Add tests for Mapper
Add tests for Generator