Updated MapClass and MapTest