Fix websocket/upgrade tests
Merge pull request #410 from jclulow/upgrade-test-fix

Fix websocket/upgrade tests