Machinize opp name on return, clean up opportunity mocks, add test for return structure by benefit.