Revert RoI metric

Just reverted the RoI computations to fix the tests.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>