Fix test, add test for failing mappings