Added compute_criterion unit tests