Tests - Refactor pusherserver into twisted vs asyncio and allow for testing both python 2.x and 3.x.
Add missing changes from previous commit.