* Add convenience method to check if websockets required * Add tests * Fix up tests for develop branch