New try to handle unification + new test file