Move rom-mapper out from the test group
Simplify Mapping::Definition