Create Unit Tests for Mappers

## Create Unit Tests for Mappers

### Acceptance Criteria
1. Quality unit tests exist for mappers