Some more websockets test fixes
fixup! Some more websockets test fixes
Remove some old files