Also use sed to remove now unneeded Vim lines, 2to3 -f ws_comma to fix some whitespace, and fix some other madness manually.
Integration tests can depend on UI, network or both. Unittests use neither.