OP-716 (Legacy Services…) : OP-730 Fixing issues with Translation Service Tests, which led to model adjustments to get it correct