Fix tests with newest importmagic HEAD, and simplify add-import

* we can now give the blacklist_re argument directly without monkeypatch
* add-import now works with suggested import statements instead of a "from module"
  which does not always apply
* fix the default "symbol to import" suggestion