Fixed the validation tests, now working on the mapping tests and mappers themselves