Minor Changes in MapTest