Updated final equality test