Corrected Equivalence. Added tests