remove forward-looking imports from abc
fix some varaible shadowing in tests