Finalise test + add websocket utilities