testRooms test now passing, minor changes to mapping function for rooms.