Bring across mapping validation tests