fix all current regression tests except unification