Unify rest tests