Fix 'could not import Base.add!' warnings and test errors