make equivalence return random variables and abstract values, added discreteuniform to distributions