Replace nearly every map grep with a YML file that actually respects structure, and fixes the massive amount of failures that were never caught

Replace nearly every map grep with a YML file that actually respects structure, and fixes the massive amount of failures that were never caught #531