Refactor of ambiguous mapping, new tests for dynamic mappings and new tests for parameter gets