Implemented mapping validation tests
10 files changed