Merge "Convert EthTrackTest from when() to doReturn()"