also use 2to3 -f ws_comma to fix some whitespace
Integration tests can depend on UI, network or both. Unittests use neither.