Mapper reviews; more tests