Fixed unit tests post shifting about
Added EquivalencyTests