Create Unit Tests for Mappers

## Create Unit Tests for Mappers

### Acceptance Criteria
1. Quality unit tests exist for mappers
Remove commented out line.  Also this test is a bit long.  You can probably extract something out.