Update to work with new rom-relation interfaces
Establish mapping for testing and simplify spec