Move some tests related to equivalencies from test_units to test_equivalencies
Add missing import
Fix import
Merge pull request #1338 from mdboom/unit/move-equivalencies-tests

Move some tests related to equivalencies from test_units to test_equivalencies