Be more consistent with 'mappings index' in tests