Add mappings and revise incorrect tests to resolve smokey failures