[FIX] Schema and mapping fixes from DSV test file