Fixed tests to reflect real MCP files.

Merger now fills data about all field and method mappings with same name, not just a first one.