OC-2256: Adapt Unit Test to the new result