updated almost all tests for py2 and py3 to add websocket versions of each test