fix tests (circular import)