RoommapperMock edits