Unify make test