re-enable all tests
working unification