Cleanup for equivalencies=None; further tests