almost there. Mapping tests