renaming things in websocket first
refactoring tests to be something like deterministic