aboutsummaryrefslogtreecommitdiffstats
path: root/_pytest
diff options
context:
space:
mode:
Diffstat (limited to '_pytest')
-rw-r--r--_pytest/data/http/rtm.start.json (renamed from _pytest/data/http/rtm.start)0
-rw-r--r--_pytest/data/websocket/1485975367.79-reconnect_url.json2
-rw-r--r--_pytest/data/websocket/1485975408.19-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485975412.74-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485975420.36-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485975421.33-message.json2
-rw-r--r--_pytest/data/websocket/1485975421.42-desktop_notification.json2
-rw-r--r--_pytest/data/websocket/1485975426.55-reaction_added.json2
-rw-r--r--_pytest/data/websocket/1485975428.76-reaction_removed.json2
-rw-r--r--_pytest/data/websocket/1485975458.35-channel_created.json2
-rw-r--r--_pytest/data/websocket/1485975458.87-channel_joined.json2
-rw-r--r--_pytest/data/websocket/1485975458.87-message.json2
-rw-r--r--_pytest/data/websocket/1485975462.62-update_thread_state.json2
-rw-r--r--_pytest/data/websocket/1485975462.62-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485975476.62-channel_deleted.json2
-rw-r--r--_pytest/data/websocket/1485975476.86-group_join.json2
-rw-r--r--_pytest/data/websocket/1485975476.86-group_joined.json2
-rw-r--r--_pytest/data/websocket/1485975487.69-group_history_changed.json2
-rw-r--r--_pytest/data/websocket/1485975487.69-group_join.json2
-rw-r--r--_pytest/data/websocket/1485975493.19-group_joined.json2
-rw-r--r--_pytest/data/websocket/1485975493.23-message.json2
-rw-r--r--_pytest/data/websocket/1485975547.75-message.json2
-rw-r--r--_pytest/data/websocket/1485975547.75-update_thread_state.json2
-rw-r--r--_pytest/data/websocket/1485975547.83-reconnect_url.json2
-rw-r--r--_pytest/data/websocket/1485975606.59-team_join.json2
-rw-r--r--_pytest/data/websocket/1485975606.67-message.json2
-rw-r--r--_pytest/data/websocket/1485975606.75-im_created.json2
-rw-r--r--_pytest/data/websocket/1485975606.75-im_open.json2
-rw-r--r--_pytest/data/websocket/1485975611.29-presence_change.json2
-rw-r--r--_pytest/data/websocket/1485975640.5-user_change.json2
-rw-r--r--_pytest/data/websocket/1485975669.14-user_change.json2
-rw-r--r--_pytest/data/websocket/1485975675.81-presence_change.json2
-rw-r--r--_pytest/data/websocket/1485975690.59-mpim_joined.json2
-rw-r--r--_pytest/data/websocket/1485975690.67-group_joined.json2
-rw-r--r--_pytest/data/websocket/1485975690.67-update_thread_state.json2
-rw-r--r--_pytest/data/websocket/1485975697.58-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485975698.45-message.json2
-rw-r--r--_pytest/data/websocket/1485975701.72-reaction_added.json2
-rw-r--r--_pytest/data/websocket/1485975703.22-reaction_removed.json2
-rw-r--r--_pytest/data/websocket/1485975715.79-message.json2
-rw-r--r--_pytest/data/websocket/1485975715.87-file_shared.json2
-rw-r--r--_pytest/data/websocket/1485975723.85-message.json2
-rw-r--r--_pytest/data/websocket/1485975727.84-reconnect_url.json2
-rw-r--r--_pytest/data/websocket/1485975735.91-group_archive.json2
-rw-r--r--_pytest/data/websocket/1485975735.99-message.json2
-rw-r--r--_pytest/data/websocket/1485975736.08-message.json2
-rw-r--r--_pytest/data/websocket/1485975738.1-desktop_notification.json2
-rw-r--r--_pytest/data/websocket/1485975747.17-channel_created.json2
-rw-r--r--_pytest/data/websocket/1485975757.63-channel_rename.json2
-rw-r--r--_pytest/data/websocket/1485975771.6-presence_change.json2
-rw-r--r--_pytest/data/websocket/1485975774.62-presence_change.json2
-rw-r--r--_pytest/data/websocket/1485975822.17-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485975824.48-message.json2
-rw-r--r--_pytest/data/websocket/1485975836.23-message.json2
-rw-r--r--_pytest/data/websocket/1485975836.31-message.json2
-rw-r--r--_pytest/data/websocket/1485975842.1-message.json2
-rw-r--r--_pytest/data/websocket/1485975842.18-message.json2
-rw-r--r--_pytest/data/websocket/1485975850.32-mpim_open.json2
-rw-r--r--_pytest/data/websocket/1485975850.45-group_open.json2
-rw-r--r--_pytest/data/websocket/1485975858.56-reaction_added.json2
-rw-r--r--_pytest/data/websocket/1485975890.7-bot_added.json2
-rw-r--r--_pytest/data/websocket/1485975890.78-message.json2
-rw-r--r--_pytest/data/websocket/1485975896.16-message.json2
-rw-r--r--_pytest/data/websocket/1485975907.84-reconnect_url.json2
-rw-r--r--_pytest/data/websocket/1485975926.59-user_change.json2
-rw-r--r--_pytest/data/websocket/1485975930.81-user_change.json2
-rw-r--r--_pytest/data/websocket/1485975956.38-file_public.json2
-rw-r--r--_pytest/data/websocket/1485975956.47-file_shared.json2
-rw-r--r--_pytest/data/websocket/1485975956.47-message.json2
-rw-r--r--_pytest/data/websocket/1485975978.79-message.json2
-rw-r--r--_pytest/data/websocket/1485975978.91-file_public.json2
-rw-r--r--_pytest/data/websocket/1485975978.91-file_shared.json2
-rw-r--r--_pytest/data/websocket/1485975995.98-file_change.json2
-rw-r--r--_pytest/data/websocket/1485975998.13-file_change.json2
-rw-r--r--_pytest/data/websocket/1485976002.57-file_deleted.json2
-rw-r--r--_pytest/data/websocket/1485976002.66-message.json2
-rw-r--r--_pytest/data/websocket/1485976024.46-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976028.31-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976039.32-reaction_added.json2
-rw-r--r--_pytest/data/websocket/1485976040.8-reaction_removed.json2
-rw-r--r--_pytest/data/websocket/1485976087.84-reconnect_url.json2
-rw-r--r--_pytest/data/websocket/1485976107.57-channel_created.json2
-rw-r--r--_pytest/data/websocket/1485976114.72-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976117.99-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976124.9-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976124.98-message.json2
-rw-r--r--_pytest/data/websocket/1485976125.06-desktop_notification.json2
-rw-r--r--_pytest/data/websocket/1485976125.95-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976129.49-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976133.0-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976137.51-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976137.95-message.json2
-rw-r--r--_pytest/data/websocket/1485976138.73-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976141.79-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976145.8-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976149.89-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976151.6-message.json2
-rw-r--r--_pytest/data/websocket/1485976157.18-message.json2
-rw-r--r--_pytest/data/websocket/1485976157.8-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976161.29-user_typing.json2
-rw-r--r--_pytest/data/websocket/1485976161.75-message.json2
-rw-r--r--_pytest/data/websocket/1485976182.59-channel_archive.json2
-rw-r--r--_pytest/data/websocket/1485976186.62-channel_unarchive.json2
-rw-r--r--_pytest/data/websocket/1485976236.58-message.json2
-rw-r--r--_pytest/data/websocket/1485976236.67-file_comment_added.json2
-rw-r--r--_pytest/data/websocket/1485976248.57-message.json2
-rw-r--r--_pytest/data/websocket/1485976248.65-file_comment_edited.json2
-rw-r--r--_pytest/data/websocket/1485976267.81-reconnect_url.json2
108 files changed, 107 insertions, 107 deletions
diff --git a/_pytest/data/http/rtm.start b/_pytest/data/http/rtm.start.json
index d9cc464..d9cc464 100644
--- a/_pytest/data/http/rtm.start
+++ b/_pytest/data/http/rtm.start.json
diff --git a/_pytest/data/websocket/1485975367.79-reconnect_url.json b/_pytest/data/websocket/1485975367.79-reconnect_url.json
index 4b53a4e..94cacca 100644
--- a/_pytest/data/websocket/1485975367.79-reconnect_url.json
+++ b/_pytest/data/websocket/1485975367.79-reconnect_url.json
@@ -1 +1 @@
-{u'url': u'wss://mpmulti-gvop.slack-msgs.com/websocket/tamYoLuX4lU-WBS7cFe2RCh8kqeO86F0Mi1RKFVfk7FM-QNu1KD7HiMBStfdLkwkKHmtyTACNE6SONtoQRTbnC0q9fAoLHPl76Y7y9IhCve6VKs2KNLmRH37WutXTBsj3b9HvF79VySlPgAwVXZeH0lgfDDk_RAY9l_dJ8u-jSs=', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reconnect_url'} \ No newline at end of file
+{"url": "wss://mpmulti-gvop.slack-msgs.com/websocket/tamYoLuX4lU-WBS7cFe2RCh8kqeO86F0Mi1RKFVfk7FM-QNu1KD7HiMBStfdLkwkKHmtyTACNE6SONtoQRTbnC0q9fAoLHPl76Y7y9IhCve6VKs2KNLmRH37WutXTBsj3b9HvF79VySlPgAwVXZeH0lgfDDk_RAY9l_dJ8u-jSs=", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reconnect_url"}
diff --git a/_pytest/data/websocket/1485975408.19-user_typing.json b/_pytest/data/websocket/1485975408.19-user_typing.json
index 572b0fd..422e30b 100644
--- a/_pytest/data/websocket/1485975408.19-user_typing.json
+++ b/_pytest/data/websocket/1485975408.19-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'D3ZEQULHZ'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "D3ZEQULHZ"}
diff --git a/_pytest/data/websocket/1485975412.74-user_typing.json b/_pytest/data/websocket/1485975412.74-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485975412.74-user_typing.json
+++ b/_pytest/data/websocket/1485975412.74-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975420.36-user_typing.json b/_pytest/data/websocket/1485975420.36-user_typing.json
index 572b0fd..422e30b 100644
--- a/_pytest/data/websocket/1485975420.36-user_typing.json
+++ b/_pytest/data/websocket/1485975420.36-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'D3ZEQULHZ'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "D3ZEQULHZ"}
diff --git a/_pytest/data/websocket/1485975421.33-message.json b/_pytest/data/websocket/1485975421.33-message.json
index 5dd2924..9a85771 100644
--- a/_pytest/data/websocket/1485975421.33-message.json
+++ b/_pytest/data/websocket/1485975421.33-message.json
@@ -1 +1 @@
-{u'text': u'hi bob', u'ts': u'1485975421.000002', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'D3ZEQULHZ'} \ No newline at end of file
+{"text": "hi bob", "ts": "1485975421.000002", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "D3ZEQULHZ"}
diff --git a/_pytest/data/websocket/1485975421.42-desktop_notification.json b/_pytest/data/websocket/1485975421.42-desktop_notification.json
index fedda07..ee6739a 100644
--- a/_pytest/data/websocket/1485975421.42-desktop_notification.json
+++ b/_pytest/data/websocket/1485975421.42-desktop_notification.json
@@ -1 +1 @@
-{u'launchUri': u'slack://channel?id=D3ZEQULHZ&message=1485975421000002&team=T3YS5EAL9', u'subtitle': u'alice', u'is_shared': False, u'title': u'weeslacktest', u'ssbFilename': u'knock_brush.mp3', u'avatarImage': u'https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0024-192.png', u'imageUri': None, u'content': u'hi bob', u'event_ts': u'1485975421.875655', u'msg': u'1485975421.000002', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'desktop_notification', u'channel': u'D3ZEQULHZ'} \ No newline at end of file
+{"avatarImage": "https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0024-192.png", "subtitle": "alice", "is_shared": false, "title": "weeslacktest", "ssbFilename": "knock_brush.mp3", "imageUri": null, "launchUri": "slack://channel?id=D3ZEQULHZ&message=1485975421000002&team=T3YS5EAL9", "event_ts": "1485975421.875655", "msg": "1485975421.000002", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "content": "hi bob", "type": "desktop_notification", "channel": "D3ZEQULHZ"}
diff --git a/_pytest/data/websocket/1485975426.55-reaction_added.json b/_pytest/data/websocket/1485975426.55-reaction_added.json
index 2a1347c..b51cfdb 100644
--- a/_pytest/data/websocket/1485975426.55-reaction_added.json
+++ b/_pytest/data/websocket/1485975426.55-reaction_added.json
@@ -1 +1 @@
-{u'reaction': u'grinning', u'event_ts': u'1485975426.875724', u'ts': u'1485975426.000003', u'item': {u'type': u'message', u'ts': u'1485975421.000002', u'channel': u'D3ZEQULHZ'}, u'user': u'U407ABLLW', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_added'} \ No newline at end of file
+{"reaction": "grinning", "event_ts": "1485975426.875724", "ts": "1485975426.000003", "item": {"type": "message", "ts": "1485975421.000002", "channel": "D3ZEQULHZ"}, "user": "U407ABLLW", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_added"}
diff --git a/_pytest/data/websocket/1485975428.76-reaction_removed.json b/_pytest/data/websocket/1485975428.76-reaction_removed.json
index efa1605..b3b90ac 100644
--- a/_pytest/data/websocket/1485975428.76-reaction_removed.json
+++ b/_pytest/data/websocket/1485975428.76-reaction_removed.json
@@ -1 +1 @@
-{u'reaction': u'grinning', u'event_ts': u'1485975428.875759', u'ts': u'1485975428.000004', u'item': {u'type': u'message', u'ts': u'1485975421.000002', u'channel': u'D3ZEQULHZ'}, u'user': u'U407ABLLW', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_removed'} \ No newline at end of file
+{"reaction": "grinning", "event_ts": "1485975428.875759", "ts": "1485975428.000004", "item": {"type": "message", "ts": "1485975421.000002", "channel": "D3ZEQULHZ"}, "user": "U407ABLLW", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_removed"}
diff --git a/_pytest/data/websocket/1485975458.35-channel_created.json b/_pytest/data/websocket/1485975458.35-channel_created.json
index bd197df..ca225d8 100644
--- a/_pytest/data/websocket/1485975458.35-channel_created.json
+++ b/_pytest/data/websocket/1485975458.35-channel_created.json
@@ -1 +1 @@
-{u'event_ts': u'1485975458.876318', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_created', u'channel': {u'is_shared': False, u'is_channel': True, u'created': 1485975458, u'creator': u'U407ABLLW', u'is_org_shared': False, u'id': u'C3ZJKCGTU', u'name': u'some-channel'}} \ No newline at end of file
+{"event_ts": "1485975458.876318", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_created", "channel": {"is_shared": false, "is_channel": true, "creator": "U407ABLLW", "created": 1485975458, "is_org_shared": false, "id": "C3ZJKCGTU", "name": "some-channel"}}
diff --git a/_pytest/data/websocket/1485975458.87-channel_joined.json b/_pytest/data/websocket/1485975458.87-channel_joined.json
index fffa5c5..8991446 100644
--- a/_pytest/data/websocket/1485975458.87-channel_joined.json
+++ b/_pytest/data/websocket/1485975458.87-channel_joined.json
@@ -1 +1 @@
-{u'event_ts': u'1485975458.876336', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_joined', u'channel': {u'topic': {u'last_set': 0, u'value': u'', u'creator': u''}, u'is_general': False, u'name': u'some-channel', u'is_channel': True, u'created': 1485975458, u'is_member': True, u'is_archived': False, u'creator': u'U407ABLLW', u'members': [u'U3ZKBBDL5', u'U407ABLLW'], u'unread_count': 0, u'previous_names': [], u'purpose': {u'last_set': 1485975458, u'value': u'who knows?', u'creator': u'U407ABLLW'}, u'unread_count_display': 0, u'last_read': u'1485975458.000003', u'id': u'C3ZJKCGTU', u'latest': {u'text': u'<@U407ABLLW|alice> set the channel purpose: who knows?', u'ts': u'1485975458.000003', u'subtype': u'channel_purpose', u'user': u'U407ABLLW', u'type': u'message', u'purpose': u'who knows?'}}} \ No newline at end of file
+{"event_ts": "1485975458.876336", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_joined", "channel": {"previous_names": [], "is_general": false, "name": "some-channel", "is_channel": true, "created": 1485975458, "is_member": true, "unread_count_display": 0, "is_archived": false, "creator": "U407ABLLW", "topic": {"last_set": 0, "value": "", "creator": ""}, "unread_count": 0, "purpose": {"last_set": 1485975458, "value": "who knows?", "creator": "U407ABLLW"}, "members": ["U3ZKBBDL5", "U407ABLLW"], "last_read": "1485975458.000003", "id": "C3ZJKCGTU", "latest": {"text": "<@U407ABLLW|alice> set the channel purpose: who knows?", "ts": "1485975458.000003", "subtype": "channel_purpose", "purpose": "who knows?", "type": "message", "user": "U407ABLLW"}}}
diff --git a/_pytest/data/websocket/1485975458.87-message.json b/_pytest/data/websocket/1485975458.87-message.json
index 80e961f..63f611c 100644
--- a/_pytest/data/websocket/1485975458.87-message.json
+++ b/_pytest/data/websocket/1485975458.87-message.json
@@ -1 +1 @@
-{u'user_profile': {u'avatar_hash': u'g6f7a5bf7eb7', u'first_name': u'Second', u'real_name': u'Second Testuser', u'name': u'bob', u'image_72': u'https://secure.gravatar.com/avatar/6f7a5bf7eb782853afb1d33f28ca9ae7.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0019-72.png'}, u'inviter': u'U407ABLLW', u'ts': u'1485975458.000004', u'subtype': u'channel_join', u'text': u'<@U3ZKBBDL5|bob> has joined the channel', u'user': u'U3ZKBBDL5', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C3ZJKCGTU'} \ No newline at end of file
+{"type": "message", "user_profile": {"avatar_hash": "g6f7a5bf7eb7", "first_name": "Second", "image_72": "https://secure.gravatar.com/avatar/6f7a5bf7eb782853afb1d33f28ca9ae7.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0019-72.png", "name": "bob", "real_name": "Second Testuser"}, "text": "<@U3ZKBBDL5|bob> has joined the channel", "ts": "1485975458.000004", "subtype": "channel_join", "user": "U3ZKBBDL5", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "inviter": "U407ABLLW", "channel": "C3ZJKCGTU"}
diff --git a/_pytest/data/websocket/1485975462.62-update_thread_state.json b/_pytest/data/websocket/1485975462.62-update_thread_state.json
index 6a74d95..7a5411a 100644
--- a/_pytest/data/websocket/1485975462.62-update_thread_state.json
+++ b/_pytest/data/websocket/1485975462.62-update_thread_state.json
@@ -1 +1 @@
-{u'mention_count': 0, u'event_ts': u'1485975458.876340', u'timestamp': u'1485975458.741354', u'has_unreads': False, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'update_thread_state'} \ No newline at end of file
+{"mention_count": 0, "event_ts": "1485975458.876340", "timestamp": "1485975458.741354", "has_unreads": false, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "update_thread_state"}
diff --git a/_pytest/data/websocket/1485975462.62-user_typing.json b/_pytest/data/websocket/1485975462.62-user_typing.json
index 5169af3..ec19e94 100644
--- a/_pytest/data/websocket/1485975462.62-user_typing.json
+++ b/_pytest/data/websocket/1485975462.62-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C3ZJKCGTU'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C3ZJKCGTU"}
diff --git a/_pytest/data/websocket/1485975476.62-channel_deleted.json b/_pytest/data/websocket/1485975476.62-channel_deleted.json
index fe1ad9e..8dd1cb8 100644
--- a/_pytest/data/websocket/1485975476.62-channel_deleted.json
+++ b/_pytest/data/websocket/1485975476.62-channel_deleted.json
@@ -1 +1 @@
-{u'event_ts': u'1485975476.876638', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_deleted', u'channel': u'C3ZJKCGTU'} \ No newline at end of file
+{"event_ts": "1485975476.876638", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_deleted", "channel": "C3ZJKCGTU"}
diff --git a/_pytest/data/websocket/1485975476.86-group_join.json b/_pytest/data/websocket/1485975476.86-group_join.json
index fdc6878..dc72eeb 100644
--- a/_pytest/data/websocket/1485975476.86-group_join.json
+++ b/_pytest/data/websocket/1485975476.86-group_join.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_join', u'user': u'U407ABLLW', u'channel': u'G409GKN9M', u'ts': u'1485975476.000002'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_join", "user": "U407ABLLW", "channel": "G409GKN9M", "ts": "1485975476.000002"}
diff --git a/_pytest/data/websocket/1485975476.86-group_joined.json b/_pytest/data/websocket/1485975476.86-group_joined.json
index b4316f3..bbd971c 100644
--- a/_pytest/data/websocket/1485975476.86-group_joined.json
+++ b/_pytest/data/websocket/1485975476.86-group_joined.json
@@ -1 +1 @@
-{u'event_ts': u'1485975476.876646', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_joined', u'channel': {u'name': u'some-channel', u'creator': u'U407ABLLW', u'is_mpim': False, u'is_archived': False, u'created': 1485975458, u'is_group': True, u'topic': {u'last_set': 1485975476, u'value': u'', u'creator': u'U407ABLLW'}, u'purpose': {u'last_set': 1485975476, u'value': u'who knows?', u'creator': u'U407ABLLW'}, u'members': [u'U407ABLLW', u'U3ZKBBDL5'], u'is_starred': False, u'id': u'G409GKN9M'}} \ No newline at end of file
+{"event_ts": "1485975476.876646", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_joined", "channel": {"name": "some-channel", "created": 1485975458, "is_mpim": false, "is_archived": false, "creator": "U407ABLLW", "is_group": true, "topic": {"last_set": 1485975476, "value": "", "creator": "U407ABLLW"}, "purpose": {"last_set": 1485975476, "value": "who knows?", "creator": "U407ABLLW"}, "members": ["U407ABLLW", "U3ZKBBDL5"], "is_starred": false, "id": "G409GKN9M"}}
diff --git a/_pytest/data/websocket/1485975487.69-group_history_changed.json b/_pytest/data/websocket/1485975487.69-group_history_changed.json
index 8eabb23..0196401 100644
--- a/_pytest/data/websocket/1485975487.69-group_history_changed.json
+++ b/_pytest/data/websocket/1485975487.69-group_history_changed.json
@@ -1 +1 @@
-{u'event_ts': u'1485975476.876650', u'is_mpim': False, u'ts': u'1485975476.000004', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_history_changed', u'channel': u'G409GKN9M', u'latest': u'1485975476.876632'} \ No newline at end of file
+{"event_ts": "1485975476.876650", "is_mpim": false, "ts": "1485975476.000004", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_history_changed", "channel": "G409GKN9M", "latest": "1485975476.876632"}
diff --git a/_pytest/data/websocket/1485975487.69-group_join.json b/_pytest/data/websocket/1485975487.69-group_join.json
index 4732dd4..0fdb54c 100644
--- a/_pytest/data/websocket/1485975487.69-group_join.json
+++ b/_pytest/data/websocket/1485975487.69-group_join.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_join', u'user': u'U3ZKBBDL5', u'channel': u'G409GKN9M', u'ts': u'1485975476.000003'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_join", "user": "U3ZKBBDL5", "channel": "G409GKN9M", "ts": "1485975476.000003"}
diff --git a/_pytest/data/websocket/1485975493.19-group_joined.json b/_pytest/data/websocket/1485975493.19-group_joined.json
index b4431c2..76e7b55 100644
--- a/_pytest/data/websocket/1485975493.19-group_joined.json
+++ b/_pytest/data/websocket/1485975493.19-group_joined.json
@@ -1 +1 @@
-{u'event_ts': u'1485975492.876964', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_joined', u'channel': {u'topic': {u'last_set': 0, u'value': u'', u'creator': u''}, u'name': u'some-private-channel', u'last_read': u'1485975492.000002', u'creator': u'U407ABLLW', u'is_mpim': False, u'is_archived': False, u'created': 1485975492, u'is_group': True, u'members': [u'U3ZKBBDL5', u'U407ABLLW'], u'unread_count': 0, u'is_open': True, u'purpose': {u'last_set': 0, u'value': u'', u'creator': u''}, u'unread_count_display': 0, u'id': u'G3ZJKP7GA', u'latest': {u'text': u'<@U407ABLLW|alice> has joined the group', u'type': u'message', u'user': u'U407ABLLW', u'ts': u'1485975492.000002', u'subtype': u'group_join'}}} \ No newline at end of file
+{"event_ts": "1485975492.876964", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_joined", "channel": {"name": "some-private-channel", "last_read": "1485975492.000002", "creator": "U407ABLLW", "is_mpim": false, "is_archived": false, "created": 1485975492, "is_group": true, "topic": {"last_set": 0, "value": "", "creator": ""}, "unread_count": 0, "is_open": true, "purpose": {"last_set": 0, "value": "", "creator": ""}, "members": ["U3ZKBBDL5", "U407ABLLW"], "latest": {"text": "<@U407ABLLW|alice> has joined the group", "subtype": "group_join", "type": "message", "user": "U407ABLLW", "ts": "1485975492.000002"}, "id": "G3ZJKP7GA", "unread_count_display": 0}}
diff --git a/_pytest/data/websocket/1485975493.23-message.json b/_pytest/data/websocket/1485975493.23-message.json
index e82d057..c6dad6c 100644
--- a/_pytest/data/websocket/1485975493.23-message.json
+++ b/_pytest/data/websocket/1485975493.23-message.json
@@ -1 +1 @@
-{u'user_profile': {u'avatar_hash': u'g6f7a5bf7eb7', u'first_name': u'Second', u'real_name': u'Second Testuser', u'name': u'bob', u'image_72': u'https://secure.gravatar.com/avatar/6f7a5bf7eb782853afb1d33f28ca9ae7.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0019-72.png'}, u'inviter': u'U407ABLLW', u'ts': u'1485975492.000003', u'subtype': u'group_join', u'text': u'<@U3ZKBBDL5|bob> has joined the group', u'user': u'U3ZKBBDL5', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'G3ZJKP7GA'} \ No newline at end of file
+{"type": "message", "user_profile": {"avatar_hash": "g6f7a5bf7eb7", "first_name": "Second", "image_72": "https://secure.gravatar.com/avatar/6f7a5bf7eb782853afb1d33f28ca9ae7.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0019-72.png", "name": "bob", "real_name": "Second Testuser"}, "text": "<@U3ZKBBDL5|bob> has joined the group", "ts": "1485975492.000003", "subtype": "group_join", "user": "U3ZKBBDL5", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "inviter": "U407ABLLW", "channel": "G3ZJKP7GA"}
diff --git a/_pytest/data/websocket/1485975547.75-message.json b/_pytest/data/websocket/1485975547.75-message.json
index 80b233b..4826952 100644
--- a/_pytest/data/websocket/1485975547.75-message.json
+++ b/_pytest/data/websocket/1485975547.75-message.json
@@ -1 +1 @@
-{u'user_profile': {u'avatar_hash': u'gfd0ce7a168d', u'first_name': u'First', u'real_name': u'First Testuser', u'name': u'alice', u'image_72': u'https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png'}, u'text': u"<@U407ABLLW|alice> set the channel's purpose: seekret", u'ts': u'1485975492.000004', u'subtype': u'group_purpose', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'G3ZJKP7GA', u'purpose': u'seekret'} \ No newline at end of file
+{"user_profile": {"avatar_hash": "gfd0ce7a168d", "first_name": "First", "image_72": "https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png", "name": "alice", "real_name": "First Testuser"}, "text": "<@U407ABLLW|alice> set the channel's purpose: seekret", "ts": "1485975492.000004", "subtype": "group_purpose", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "G3ZJKP7GA", "purpose": "seekret"}
diff --git a/_pytest/data/websocket/1485975547.75-update_thread_state.json b/_pytest/data/websocket/1485975547.75-update_thread_state.json
index 08de51c..4d91b20 100644
--- a/_pytest/data/websocket/1485975547.75-update_thread_state.json
+++ b/_pytest/data/websocket/1485975547.75-update_thread_state.json
@@ -1 +1 @@
-{u'mention_count': 0, u'event_ts': u'1485975492.876967', u'timestamp': u'1485975493.013414', u'has_unreads': False, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'update_thread_state'} \ No newline at end of file
+{"mention_count": 0, "event_ts": "1485975492.876967", "timestamp": "1485975493.013414", "has_unreads": false, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "update_thread_state"}
diff --git a/_pytest/data/websocket/1485975547.83-reconnect_url.json b/_pytest/data/websocket/1485975547.83-reconnect_url.json
index f8ec065..42da6c5 100644
--- a/_pytest/data/websocket/1485975547.83-reconnect_url.json
+++ b/_pytest/data/websocket/1485975547.83-reconnect_url.json
@@ -1 +1 @@
-{u'url': u'wss://mpmulti-t63z.slack-msgs.com/websocket/I4VgKhpT11zUwKt_Wajw_phIbuzM7xTy0V0DVLb6dyPDkqGU5-497Jn3bOGncotPX4QhfZepKVtlUkrSWCqMcbjH_vjRo91HBvzvk4nJoScjn6KJatZ6vpzokG44Ee-vNMsxXLeedcbraFAzCrLlODGRqvdqxUQDQFMVES0XHP8=', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reconnect_url'} \ No newline at end of file
+{"url": "wss://mpmulti-t63z.slack-msgs.com/websocket/I4VgKhpT11zUwKt_Wajw_phIbuzM7xTy0V0DVLb6dyPDkqGU5-497Jn3bOGncotPX4QhfZepKVtlUkrSWCqMcbjH_vjRo91HBvzvk4nJoScjn6KJatZ6vpzokG44Ee-vNMsxXLeedcbraFAzCrLlODGRqvdqxUQDQFMVES0XHP8=", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reconnect_url"}
diff --git a/_pytest/data/websocket/1485975606.59-team_join.json b/_pytest/data/websocket/1485975606.59-team_join.json
index 23f780f..3af908e 100644
--- a/_pytest/data/websocket/1485975606.59-team_join.json
+++ b/_pytest/data/websocket/1485975606.59-team_join.json
@@ -1 +1 @@
-{u'event_ts': u'1485975606.879253', u'cache_ts': 1485975606, u'type': u'team_join', u'user': {u'status': None, u'profile': {u'first_name': u'Chuck', u'last_name': u'Testuser', u'fields': None, u'real_name': u'Chuck Testuser', u'image_24': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=24&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-24.png', u'real_name_normalized': u'Chuck Testuser', u'image_512': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=512&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-512.png', u'image_32': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=32&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-32.png', u'image_48': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-48.png', u'image_72': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png', u'avatar_hash': u'g7f87f7015f8', u'image_192': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-192.png'}, u'tz': u'America/Los_Angeles', u'name': u'chuck', u'presence': u'away', u'deleted': False, u'is_bot': False, u'tz_label': u'Pacific Standard Time', u'real_name': u'Chuck Testuser', u'color': u'e7392d', u'team_id': u'T3YS5EAL9', u'is_admin': False, u'is_ultra_restricted': False, u'is_restricted': False, u'is_owner': False, u'tz_offset': -28800, u'id': u'U4096CBHC', u'is_primary_owner': False}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}} \ No newline at end of file
+{"event_ts": "1485975606.879253", "cache_ts": 1485975606, "type": "team_join", "user": {"status": null, "profile": {"first_name": "Chuck", "last_name": "Testuser", "fields": null, "real_name": "Chuck Testuser", "image_24": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=24&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-24.png", "real_name_normalized": "Chuck Testuser", "image_512": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=512&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-512.png", "image_32": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=32&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-32.png", "image_48": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-48.png", "avatar_hash": "g7f87f7015f8", "image_72": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png", "image_192": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-192.png"}, "tz": "America/Los_Angeles", "name": "chuck", "presence": "away", "deleted": false, "is_bot": false, "tz_label": "Pacific Standard Time", "real_name": "Chuck Testuser", "color": "e7392d", "team_id": "T3YS5EAL9", "is_admin": false, "is_ultra_restricted": false, "is_restricted": false, "tz_offset": -28800, "is_primary_owner": false, "id": "U4096CBHC", "is_owner": false}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}}
diff --git a/_pytest/data/websocket/1485975606.67-message.json b/_pytest/data/websocket/1485975606.67-message.json
index 8aec187..cfc8e5f 100644
--- a/_pytest/data/websocket/1485975606.67-message.json
+++ b/_pytest/data/websocket/1485975606.67-message.json
@@ -1 +1 @@
-{u'user_profile': {u'avatar_hash': u'g7f87f7015f8', u'first_name': u'Chuck', u'real_name': u'Chuck Testuser', u'name': u'chuck', u'image_72': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png'}, u'text': u'<@U4096CBHC|chuck> has joined the channel', u'ts': u'1485975606.000003', u'subtype': u'channel_join', u'user': u'U4096CBHC', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"user_profile": {"avatar_hash": "g7f87f7015f8", "first_name": "Chuck", "image_72": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png", "name": "chuck", "real_name": "Chuck Testuser"}, "text": "<@U4096CBHC|chuck> has joined the channel", "ts": "1485975606.000003", "subtype": "channel_join", "user": "U4096CBHC", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975606.75-im_created.json b/_pytest/data/websocket/1485975606.75-im_created.json
index 295929f..fa360d8 100644
--- a/_pytest/data/websocket/1485975606.75-im_created.json
+++ b/_pytest/data/websocket/1485975606.75-im_created.json
@@ -1 +1 @@
-{u'event_ts': u'1485975606.879278', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'im_created', u'user': u'U4096CBHC', u'channel': {u'last_read': u'0000000000.000000', u'created': 1485975606, u'is_org_shared': False, u'unread_count': 0, u'is_open': False, u'user': u'U4096CBHC', u'unread_count_display': 0, u'is_im': True, u'id': u'D409J34CF', u'latest': None}} \ No newline at end of file
+{"event_ts": "1485975606.879278", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "im_created", "user": "U4096CBHC", "channel": {"last_read": "0000000000.000000", "created": 1485975606, "is_org_shared": false, "unread_count": 0, "is_open": false, "user": "U4096CBHC", "unread_count_display": 0, "is_im": true, "id": "D409J34CF", "latest": null}}
diff --git a/_pytest/data/websocket/1485975606.75-im_open.json b/_pytest/data/websocket/1485975606.75-im_open.json
index 883a9ee..f2a9696 100644
--- a/_pytest/data/websocket/1485975606.75-im_open.json
+++ b/_pytest/data/websocket/1485975606.75-im_open.json
@@ -1 +1 @@
-{u'event_ts': u'1485975606.879280', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'im_open', u'user': u'U4096CBHC', u'channel': u'D409J34CF'} \ No newline at end of file
+{"event_ts": "1485975606.879280", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "im_open", "user": "U4096CBHC", "channel": "D409J34CF"}
diff --git a/_pytest/data/websocket/1485975611.29-presence_change.json b/_pytest/data/websocket/1485975611.29-presence_change.json
index 2395dc0..ec41e5f 100644
--- a/_pytest/data/websocket/1485975611.29-presence_change.json
+++ b/_pytest/data/websocket/1485975611.29-presence_change.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'presence_change', u'user': u'U4096CBHC', u'presence': u'active'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "presence_change", "user": "U4096CBHC", "presence": "active"}
diff --git a/_pytest/data/websocket/1485975640.5-user_change.json b/_pytest/data/websocket/1485975640.5-user_change.json
index a722cfc..9c2b114 100644
--- a/_pytest/data/websocket/1485975640.5-user_change.json
+++ b/_pytest/data/websocket/1485975640.5-user_change.json
@@ -1 +1 @@
-{u'event_ts': u'1485975640.879906', u'cache_ts': 1485975640, u'type': u'user_change', u'user': {u'status': None, u'profile': {u'first_name': u'Charles', u'last_name': u'Testuser', u'fields': [], u'real_name': u'Charles Testuser', u'image_24': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=24&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-24.png', u'real_name_normalized': u'Charles Testuser', u'image_512': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=512&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-512.png', u'image_32': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=32&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-32.png', u'image_48': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-48.png', u'image_72': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png', u'avatar_hash': u'g7f87f7015f8', u'image_192': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-192.png'}, u'tz': u'America/Los_Angeles', u'name': u'chuck', u'deleted': False, u'is_bot': False, u'tz_label': u'Pacific Standard Time', u'real_name': u'Charles Testuser', u'color': u'e7392d', u'team_id': u'T3YS5EAL9', u'is_admin': False, u'is_ultra_restricted': False, u'is_restricted': False, u'is_owner': False, u'tz_offset': -28800, u'id': u'U4096CBHC', u'is_primary_owner': False}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}} \ No newline at end of file
+{"event_ts": "1485975640.879906", "cache_ts": 1485975640, "type": "user_change", "user": {"status": null, "profile": {"first_name": "Charles", "last_name": "Testuser", "fields": [], "real_name": "Charles Testuser", "image_24": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=24&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-24.png", "real_name_normalized": "Charles Testuser", "image_512": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=512&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-512.png", "image_32": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=32&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-32.png", "image_48": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-48.png", "avatar_hash": "g7f87f7015f8", "image_72": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png", "image_192": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-192.png"}, "tz": "America/Los_Angeles", "name": "chuck", "deleted": false, "is_bot": false, "tz_label": "Pacific Standard Time", "real_name": "Charles Testuser", "color": "e7392d", "team_id": "T3YS5EAL9", "is_admin": false, "is_ultra_restricted": false, "is_restricted": false, "tz_offset": -28800, "is_primary_owner": false, "id": "U4096CBHC", "is_owner": false}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}}
diff --git a/_pytest/data/websocket/1485975669.14-user_change.json b/_pytest/data/websocket/1485975669.14-user_change.json
index 2faf007..0561553 100644
--- a/_pytest/data/websocket/1485975669.14-user_change.json
+++ b/_pytest/data/websocket/1485975669.14-user_change.json
@@ -1 +1 @@
-{u'event_ts': u'1485975668.880329', u'cache_ts': 1485975669, u'type': u'user_change', u'user': {u'status': None, u'profile': {u'first_name': u'Charles', u'last_name': u'Testuser', u'fields': [], u'real_name': u'Charles Testuser', u'image_24': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=24&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-24.png', u'real_name_normalized': u'Charles Testuser', u'image_512': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=512&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-512.png', u'image_32': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=32&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-32.png', u'image_48': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-48.png', u'image_72': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png', u'avatar_hash': u'g7f87f7015f8', u'image_192': u'https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-192.png'}, u'tz': u'America/Los_Angeles', u'name': u'charles', u'deleted': False, u'is_bot': False, u'tz_label': u'Pacific Standard Time', u'real_name': u'Charles Testuser', u'color': u'e7392d', u'team_id': u'T3YS5EAL9', u'is_admin': False, u'is_ultra_restricted': False, u'is_restricted': False, u'is_owner': False, u'tz_offset': -28800, u'id': u'U4096CBHC', u'is_primary_owner': False}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}} \ No newline at end of file
+{"event_ts": "1485975668.880329", "cache_ts": 1485975669, "type": "user_change", "user": {"status": null, "profile": {"first_name": "Charles", "last_name": "Testuser", "fields": [], "real_name": "Charles Testuser", "image_24": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=24&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-24.png", "real_name_normalized": "Charles Testuser", "image_512": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=512&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-512.png", "image_32": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=32&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-32.png", "image_48": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=48&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-48.png", "avatar_hash": "g7f87f7015f8", "image_72": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0010-72.png", "image_192": "https://secure.gravatar.com/avatar/7f87f7015f8e5081190ece053e41b11e.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0010-192.png"}, "tz": "America/Los_Angeles", "name": "charles", "deleted": false, "is_bot": false, "tz_label": "Pacific Standard Time", "real_name": "Charles Testuser", "color": "e7392d", "team_id": "T3YS5EAL9", "is_admin": false, "is_ultra_restricted": false, "is_restricted": false, "tz_offset": -28800, "is_primary_owner": false, "id": "U4096CBHC", "is_owner": false}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}}
diff --git a/_pytest/data/websocket/1485975675.81-presence_change.json b/_pytest/data/websocket/1485975675.81-presence_change.json
index 2395dc0..ec41e5f 100644
--- a/_pytest/data/websocket/1485975675.81-presence_change.json
+++ b/_pytest/data/websocket/1485975675.81-presence_change.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'presence_change', u'user': u'U4096CBHC', u'presence': u'active'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "presence_change", "user": "U4096CBHC", "presence": "active"}
diff --git a/_pytest/data/websocket/1485975690.59-mpim_joined.json b/_pytest/data/websocket/1485975690.59-mpim_joined.json
index c4e0bc0..d377778 100644
--- a/_pytest/data/websocket/1485975690.59-mpim_joined.json
+++ b/_pytest/data/websocket/1485975690.59-mpim_joined.json
@@ -1 +1 @@
-{u'event_ts': u'1485975690.880722', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'mpim_joined', u'channel': {u'topic': {u'last_set': 1485975690, u'value': u'Group messaging', u'creator': u'U407ABLLW'}, u'name': u'mpdm-bob--alice--charles-1', u'last_read': u'0000000000.000000', u'creator': u'U407ABLLW', u'is_mpim': True, u'is_archived': False, u'created': 1485975690, u'is_group': True, u'members': [u'U407ABLLW', u'U3ZKBBDL5', u'U4096CBHC'], u'unread_count': 0, u'is_open': False, u'purpose': {u'last_set': 1485975690, u'value': u'Group messaging with: @bob @alice @charles', u'creator': u'U407ABLLW'}, u'unread_count_display': 0, u'id': u'G3ZGMF4RZ', u'latest': None}} \ No newline at end of file
+{"event_ts": "1485975690.880722", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "mpim_joined", "channel": {"name": "mpdm-bob--alice--charles-1", "last_read": "0000000000.000000", "creator": "U407ABLLW", "is_mpim": true, "is_archived": false, "created": 1485975690, "is_group": true, "topic": {"last_set": 1485975690, "value": "Group messaging", "creator": "U407ABLLW"}, "unread_count": 0, "is_open": false, "purpose": {"last_set": 1485975690, "value": "Group messaging with: @bob @alice @charles", "creator": "U407ABLLW"}, "members": ["U407ABLLW", "U3ZKBBDL5", "U4096CBHC"], "latest": null, "id": "G3ZGMF4RZ", "unread_count_display": 0}}
diff --git a/_pytest/data/websocket/1485975690.67-group_joined.json b/_pytest/data/websocket/1485975690.67-group_joined.json
index 3968cc3..b1c27dd 100644
--- a/_pytest/data/websocket/1485975690.67-group_joined.json
+++ b/_pytest/data/websocket/1485975690.67-group_joined.json
@@ -1 +1 @@
-{u'event_ts': u'1485975690.880723', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_joined', u'channel': {u'topic': {u'last_set': 1485975690, u'value': u'Group messaging', u'creator': u'U407ABLLW'}, u'name': u'mpdm-bob--alice--charles-1', u'last_read': u'0000000000.000000', u'creator': u'U407ABLLW', u'is_mpim': True, u'is_archived': False, u'created': 1485975690, u'is_group': True, u'members': [u'U407ABLLW', u'U3ZKBBDL5', u'U4096CBHC'], u'unread_count': 0, u'is_open': False, u'purpose': {u'last_set': 1485975690, u'value': u'Group messaging with: @bob @alice @charles', u'creator': u'U407ABLLW'}, u'unread_count_display': 0, u'id': u'G3ZGMF4RZ', u'latest': None}} \ No newline at end of file
+{"event_ts": "1485975690.880723", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_joined", "channel": {"name": "mpdm-bob--alice--charles-1", "last_read": "0000000000.000000", "creator": "U407ABLLW", "is_mpim": true, "is_archived": false, "created": 1485975690, "is_group": true, "topic": {"last_set": 1485975690, "value": "Group messaging", "creator": "U407ABLLW"}, "unread_count": 0, "is_open": false, "purpose": {"last_set": 1485975690, "value": "Group messaging with: @bob @alice @charles", "creator": "U407ABLLW"}, "members": ["U407ABLLW", "U3ZKBBDL5", "U4096CBHC"], "latest": null, "id": "G3ZGMF4RZ", "unread_count_display": 0}}
diff --git a/_pytest/data/websocket/1485975690.67-update_thread_state.json b/_pytest/data/websocket/1485975690.67-update_thread_state.json
index c9ba02a..c745df6 100644
--- a/_pytest/data/websocket/1485975690.67-update_thread_state.json
+++ b/_pytest/data/websocket/1485975690.67-update_thread_state.json
@@ -1 +1 @@
-{u'mention_count': 0, u'event_ts': u'1485975690.880724', u'timestamp': u'1485975690.537094', u'has_unreads': False, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'update_thread_state'} \ No newline at end of file
+{"mention_count": 0, "event_ts": "1485975690.880724", "timestamp": "1485975690.537094", "has_unreads": false, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "update_thread_state"}
diff --git a/_pytest/data/websocket/1485975697.58-user_typing.json b/_pytest/data/websocket/1485975697.58-user_typing.json
index b909fa3..b8239d4 100644
--- a/_pytest/data/websocket/1485975697.58-user_typing.json
+++ b/_pytest/data/websocket/1485975697.58-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'G3ZGMF4RZ'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "G3ZGMF4RZ"}
diff --git a/_pytest/data/websocket/1485975698.45-message.json b/_pytest/data/websocket/1485975698.45-message.json
index 777d55f..2118ec7 100644
--- a/_pytest/data/websocket/1485975698.45-message.json
+++ b/_pytest/data/websocket/1485975698.45-message.json
@@ -1 +1 @@
-{u'text': u'surely', u'ts': u'1485975698.000002', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'G3ZGMF4RZ'} \ No newline at end of file
+{"text": "surely", "ts": "1485975698.000002", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "G3ZGMF4RZ"}
diff --git a/_pytest/data/websocket/1485975701.72-reaction_added.json b/_pytest/data/websocket/1485975701.72-reaction_added.json
index e9328c7..b4d2282 100644
--- a/_pytest/data/websocket/1485975701.72-reaction_added.json
+++ b/_pytest/data/websocket/1485975701.72-reaction_added.json
@@ -1 +1 @@
-{u'reaction': u'unamused', u'event_ts': u'1485975701.880957', u'ts': u'1485975701.000003', u'item': {u'type': u'message', u'ts': u'1485975698.000002', u'channel': u'G3ZGMF4RZ'}, u'user': u'U407ABLLW', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_added'} \ No newline at end of file
+{"reaction": "unamused", "event_ts": "1485975701.880957", "ts": "1485975701.000003", "item": {"type": "message", "ts": "1485975698.000002", "channel": "G3ZGMF4RZ"}, "user": "U407ABLLW", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_added"}
diff --git a/_pytest/data/websocket/1485975703.22-reaction_removed.json b/_pytest/data/websocket/1485975703.22-reaction_removed.json
index 1e0e0df..3deafb2 100644
--- a/_pytest/data/websocket/1485975703.22-reaction_removed.json
+++ b/_pytest/data/websocket/1485975703.22-reaction_removed.json
@@ -1 +1 @@
-{u'reaction': u'unamused', u'event_ts': u'1485975703.880979', u'ts': u'1485975703.000004', u'item': {u'type': u'message', u'ts': u'1485975698.000002', u'channel': u'G3ZGMF4RZ'}, u'user': u'U407ABLLW', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_removed'} \ No newline at end of file
+{"reaction": "unamused", "event_ts": "1485975703.880979", "ts": "1485975703.000004", "item": {"type": "message", "ts": "1485975698.000002", "channel": "G3ZGMF4RZ"}, "user": "U407ABLLW", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_removed"}
diff --git a/_pytest/data/websocket/1485975715.79-message.json b/_pytest/data/websocket/1485975715.79-message.json
index 2668055..5d3c51c 100644
--- a/_pytest/data/websocket/1485975715.79-message.json
+++ b/_pytest/data/websocket/1485975715.79-message.json
@@ -1 +1 @@
-{u'username': u'<@U407ABLLW|alice>', u'source_team': u'T3YS5EAL9', u'display_as_bot': False, u'text': u'<@U407ABLLW|alice> uploaded a file: <https://weeslacktest.slack.com/files/alice/F3ZLY6K5J/-.txt|Untitled>', u'channel': u'G3ZGMF4RZ', u'user_profile': {u'avatar_hash': u'gfd0ce7a168d', u'first_name': u'First', u'real_name': u'First Testuser', u'name': u'alice', u'image_72': u'https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png'}, u'upload': True, u'ts': u'1485975715.000005', u'subtype': u'file_share', u'user': u'U407ABLLW', u'file': {u'filetype': u'text', u'lines_more': 0, u'channels': [], u'display_as_bot': False, u'id': u'F3ZLY6K5J', u'size': 14, u'title': u'Untitled', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZLY6K5J/-.txt', u'ims': [], u'preview': u'some code here', u'external_type': u'', u'edit_link': u'https://weeslacktest.slack.com/files/alice/F3ZLY6K5J/-.txt/edit', u'username': u'', u'timestamp': 1485975715, u'public_url_shared': False, u'editable': True, u'preview_is_truncated': False, u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZLY6K5J/download/-.txt', u'user': u'U407ABLLW', u'groups': [], u'is_public': False, u'pretty_type': u'Plain Text', u'name': u'-.txt', u'mimetype': u'text/plain', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3ZLY6K5J-39c2c4f739', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3ZLY6K5J/-.txt', u'is_external': False, u'created': 1485975715, u'lines': 1, u'comments_count': 0, u'mode': u'snippet', u'preview_highlight': u'<div class="CodeMirror cm-s-default CodeMirrorServer" oncopy="if(event.clipboardData){event.clipboardData.setData(\'text/plain\',window.getSelection().toString().replace(/\\u200b/g,\'\'));event.preventDefault();event.stopPropagation();}">\n<div class="CodeMirror-code">\n<div><pre>some code here</pre></div>\n</div>\n</div>\n'}, u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'user_team': u'T3YS5EAL9', u'bot_id': None} \ No newline at end of file
+{"username": "<@U407ABLLW|alice>", "source_team": "T3YS5EAL9", "user_profile": {"avatar_hash": "gfd0ce7a168d", "first_name": "First", "image_72": "https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png", "name": "alice", "real_name": "First Testuser"}, "text": "<@U407ABLLW|alice> uploaded a file: <https://weeslacktest.slack.com/files/alice/F3ZLY6K5J/-.txt|Untitled>", "team": "T3YS5EAL9", "upload": true, "ts": "1485975715.000005", "display_as_bot": false, "user": "U407ABLLW", "file": {"filetype": "text", "lines_more": 0, "channels": [], "display_as_bot": false, "id": "F3ZLY6K5J", "size": 14, "title": "Untitled", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZLY6K5J/-.txt", "ims": [], "preview": "some code here", "external_type": "", "edit_link": "https://weeslacktest.slack.com/files/alice/F3ZLY6K5J/-.txt/edit", "username": "", "timestamp": 1485975715, "public_url_shared": false, "editable": true, "preview_highlight": "<div class=\"CodeMirror cm-s-default CodeMirrorServer\" oncopy=\"if(event.clipboardData){event.clipboardData.setData('text/plain',window.getSelection().toString().replace(/\\u200b/g,''));event.preventDefault();event.stopPropagation();}\">\n<div class=\"CodeMirror-code\">\n<div><pre>some code here</pre></div>\n</div>\n</div>\n", "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZLY6K5J/download/-.txt", "user": "U407ABLLW", "groups": [], "is_public": false, "pretty_type": "Plain Text", "is_external": false, "mimetype": "text/plain", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3ZLY6K5J-39c2c4f739", "permalink": "https://weeslacktest.slack.com/files/alice/F3ZLY6K5J/-.txt", "name": "-.txt", "created": 1485975715, "lines": 1, "comments_count": 0, "mode": "snippet", "preview_is_truncated": false}, "subtype": "file_share", "user_team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "G3ZGMF4RZ", "bot_id": null}
diff --git a/_pytest/data/websocket/1485975715.87-file_shared.json b/_pytest/data/websocket/1485975715.87-file_shared.json
index 2149f8c..526f72c 100644
--- a/_pytest/data/websocket/1485975715.87-file_shared.json
+++ b/_pytest/data/websocket/1485975715.87-file_shared.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975715.881302', u'file_id': u'F3ZLY6K5J', u'file': {u'id': u'F3ZLY6K5J'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_shared'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975715.881302", "file_id": "F3ZLY6K5J", "file": {"id": "F3ZLY6K5J"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_shared"}
diff --git a/_pytest/data/websocket/1485975723.85-message.json b/_pytest/data/websocket/1485975723.85-message.json
index 0e52b67..d06d025 100644
--- a/_pytest/data/websocket/1485975723.85-message.json
+++ b/_pytest/data/websocket/1485975723.85-message.json
@@ -1 +1 @@
-{u'event_ts': u'1485975723.881563', u'ts': u'1485975723.000006', u'subtype': u'message_deleted', u'hidden': True, u'deleted_ts': u'1485975698.000002', u'type': u'message', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'channel': u'G3ZGMF4RZ', u'previous_message': {u'text': u'surely', u'type': u'message', u'user': u'U407ABLLW', u'ts': u'1485975698.000002'}} \ No newline at end of file
+{"event_ts": "1485975723.881563", "ts": "1485975723.000006", "subtype": "message_deleted", "hidden": true, "previous_message": {"text": "surely", "type": "message", "user": "U407ABLLW", "ts": "1485975698.000002"}, "type": "message", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "channel": "G3ZGMF4RZ", "deleted_ts": "1485975698.000002"}
diff --git a/_pytest/data/websocket/1485975727.84-reconnect_url.json b/_pytest/data/websocket/1485975727.84-reconnect_url.json
index d1417e2..3630d02 100644
--- a/_pytest/data/websocket/1485975727.84-reconnect_url.json
+++ b/_pytest/data/websocket/1485975727.84-reconnect_url.json
@@ -1 +1 @@
-{u'url': u'wss://mpmulti-824w.slack-msgs.com/websocket/Pl7CWLLi3w1S0gHESj79_JySeV0ho6vZRl1usylFoDVBWTj332mKkaLBR6OdrDqRDlYPnwwnh9TqlqOMVajfyHMH_Q02oVU14YJS_ao5_nEJBBd58vDB3XkKfGdPRZNgP2Id05xTpEy9izt9EF_BdDaDaTU9nGc5c2ggnuS9gos=', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reconnect_url'} \ No newline at end of file
+{"url": "wss://mpmulti-824w.slack-msgs.com/websocket/Pl7CWLLi3w1S0gHESj79_JySeV0ho6vZRl1usylFoDVBWTj332mKkaLBR6OdrDqRDlYPnwwnh9TqlqOMVajfyHMH_Q02oVU14YJS_ao5_nEJBBd58vDB3XkKfGdPRZNgP2Id05xTpEy9izt9EF_BdDaDaTU9nGc5c2ggnuS9gos=", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reconnect_url"}
diff --git a/_pytest/data/websocket/1485975735.91-group_archive.json b/_pytest/data/websocket/1485975735.91-group_archive.json
index 05dd53e..61cfdc7 100644
--- a/_pytest/data/websocket/1485975735.91-group_archive.json
+++ b/_pytest/data/websocket/1485975735.91-group_archive.json
@@ -1 +1 @@
-{u'event_ts': u'1485975735.881780', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_archive', u'ts': u'1485975735.000005', u'channel': u'G409GKN9M'} \ No newline at end of file
+{"event_ts": "1485975735.881780", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_archive", "ts": "1485975735.000005", "channel": "G409GKN9M"}
diff --git a/_pytest/data/websocket/1485975735.99-message.json b/_pytest/data/websocket/1485975735.99-message.json
index 3ca5b71..10f541f 100644
--- a/_pytest/data/websocket/1485975735.99-message.json
+++ b/_pytest/data/websocket/1485975735.99-message.json
@@ -1 +1 @@
-{u'user_profile': {u'avatar_hash': u'gfd0ce7a168d', u'first_name': u'First', u'real_name': u'First Testuser', u'name': u'alice', u'image_72': u'https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png'}, u'text': u'<@U407ABLLW|alice> archived the private channel', u'ts': u'1485975735.000006', u'subtype': u'group_archive', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'G409GKN9M'} \ No newline at end of file
+{"user_profile": {"avatar_hash": "gfd0ce7a168d", "first_name": "First", "image_72": "https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png", "name": "alice", "real_name": "First Testuser"}, "text": "<@U407ABLLW|alice> archived the private channel", "ts": "1485975735.000006", "subtype": "group_archive", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "G409GKN9M"}
diff --git a/_pytest/data/websocket/1485975736.08-message.json b/_pytest/data/websocket/1485975736.08-message.json
index 172f553..147dbb4 100644
--- a/_pytest/data/websocket/1485975736.08-message.json
+++ b/_pytest/data/websocket/1485975736.08-message.json
@@ -1 +1 @@
-{u'text': u'<@U407ABLLW|alice> archived the private channel <https://weeslacktest.slack.com/archives/some-channel|some-channel>', u'ts': u'1485975735.000002', u'user': u'USLACKBOT', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'D3ZK1D8JY'} \ No newline at end of file
+{"text": "<@U407ABLLW|alice> archived the private channel <https://weeslacktest.slack.com/archives/some-channel|some-channel>", "ts": "1485975735.000002", "user": "USLACKBOT", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "D3ZK1D8JY"}
diff --git a/_pytest/data/websocket/1485975738.1-desktop_notification.json b/_pytest/data/websocket/1485975738.1-desktop_notification.json
index 56e72f9..da451bb 100644
--- a/_pytest/data/websocket/1485975738.1-desktop_notification.json
+++ b/_pytest/data/websocket/1485975738.1-desktop_notification.json
@@ -1 +1 @@
-{u'launchUri': u'slack://channel?id=D3ZK1D8JY&message=1485975735000002&team=T3YS5EAL9', u'subtitle': u'slackbot', u'is_shared': False, u'title': u'weeslacktest', u'ssbFilename': u'knock_brush.mp3', u'avatarImage': u'https://a.slack-edge.com/66f9/img/slackbot_192.png', u'imageUri': None, u'content': u'@alice archived the private channel some-channel', u'event_ts': u'1485975737.881829', u'msg': u'1485975735.000002', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'desktop_notification', u'channel': u'D3ZK1D8JY'} \ No newline at end of file
+{"avatarImage": "https://a.slack-edge.com/66f9/img/slackbot_192.png", "subtitle": "slackbot", "is_shared": false, "title": "weeslacktest", "ssbFilename": "knock_brush.mp3", "imageUri": null, "launchUri": "slack://channel?id=D3ZK1D8JY&message=1485975735000002&team=T3YS5EAL9", "event_ts": "1485975737.881829", "msg": "1485975735.000002", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "content": "@alice archived the private channel some-channel", "type": "desktop_notification", "channel": "D3ZK1D8JY"}
diff --git a/_pytest/data/websocket/1485975747.17-channel_created.json b/_pytest/data/websocket/1485975747.17-channel_created.json
index 453552d..6bcafdb 100644
--- a/_pytest/data/websocket/1485975747.17-channel_created.json
+++ b/_pytest/data/websocket/1485975747.17-channel_created.json
@@ -1 +1 @@
-{u'event_ts': u'1485975746.882009', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_created', u'channel': {u'is_shared': False, u'is_channel': True, u'created': 1485975747, u'creator': u'U407ABLLW', u'is_org_shared': False, u'id': u'C3ZM8JTD3', u'name': u'some-channel2'}} \ No newline at end of file
+{"event_ts": "1485975746.882009", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_created", "channel": {"is_shared": false, "is_channel": true, "creator": "U407ABLLW", "created": 1485975747, "is_org_shared": false, "id": "C3ZM8JTD3", "name": "some-channel2"}}
diff --git a/_pytest/data/websocket/1485975757.63-channel_rename.json b/_pytest/data/websocket/1485975757.63-channel_rename.json
index ff5e537..a921fed 100644
--- a/_pytest/data/websocket/1485975757.63-channel_rename.json
+++ b/_pytest/data/websocket/1485975757.63-channel_rename.json
@@ -1 +1 @@
-{u'event_ts': u'1485975757.882178', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_rename', u'channel': {u'created': u'1485975747', u'id': u'C3ZM8JTD3', u'is_channel': True, u'name': u'some-channel2-renamed'}} \ No newline at end of file
+{"event_ts": "1485975757.882178", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_rename", "channel": {"name": "some-channel2-renamed", "id": "C3ZM8JTD3", "is_channel": true, "created": "1485975747"}}
diff --git a/_pytest/data/websocket/1485975771.6-presence_change.json b/_pytest/data/websocket/1485975771.6-presence_change.json
index e7252bc..e70421c 100644
--- a/_pytest/data/websocket/1485975771.6-presence_change.json
+++ b/_pytest/data/websocket/1485975771.6-presence_change.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'presence_change', u'user': u'U407ABLLW', u'presence': u'away'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "presence_change", "user": "U407ABLLW", "presence": "away"}
diff --git a/_pytest/data/websocket/1485975774.62-presence_change.json b/_pytest/data/websocket/1485975774.62-presence_change.json
index a180d76..9728fae 100644
--- a/_pytest/data/websocket/1485975774.62-presence_change.json
+++ b/_pytest/data/websocket/1485975774.62-presence_change.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'presence_change', u'user': u'U407ABLLW', u'presence': u'active'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "presence_change", "user": "U407ABLLW", "presence": "active"}
diff --git a/_pytest/data/websocket/1485975822.17-user_typing.json b/_pytest/data/websocket/1485975822.17-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485975822.17-user_typing.json
+++ b/_pytest/data/websocket/1485975822.17-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975824.48-message.json b/_pytest/data/websocket/1485975824.48-message.json
index bdcee99..9fae542 100644
--- a/_pytest/data/websocket/1485975824.48-message.json
+++ b/_pytest/data/websocket/1485975824.48-message.json
@@ -1 +1 @@
-{u'text': u'generally, yep!', u'ts': u'1485975824.000004', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"text": "generally, yep!", "ts": "1485975824.000004", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975836.23-message.json b/_pytest/data/websocket/1485975836.23-message.json
index 5ac0bac..6715bed 100644
--- a/_pytest/data/websocket/1485975836.23-message.json
+++ b/_pytest/data/websocket/1485975836.23-message.json
@@ -1 +1 @@
-{u'thread_ts': u'1485975824.000004', u'text': u'have you met my friend threads?', u'ts': u'1485975835.000005', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"thread_ts": "1485975824.000004", "text": "have you met my friend threads?", "ts": "1485975835.000005", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975836.31-message.json b/_pytest/data/websocket/1485975836.31-message.json
index a90ce8b..3823c61 100644
--- a/_pytest/data/websocket/1485975836.31-message.json
+++ b/_pytest/data/websocket/1485975836.31-message.json
@@ -1 +1 @@
-{u'event_ts': u'1485975835.883772', u'ts': u'1485975835.000006', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'subtype': u'message_replied', u'message': {u'thread_ts': u'1485975824.000004', u'text': u'generally, yep!', u'ts': u'1485975824.000004', u'reply_count': 1, u'user': u'U407ABLLW', u'replies': [{u'user': u'U407ABLLW', u'ts': u'1485975835.000005'}], u'type': u'message'}, u'type': u'message', u'hidden': True, u'channel': u'C407ABS94'} \ No newline at end of file
+{"hidden": true, "event_ts": "1485975835.883772", "ts": "1485975835.000006", "subtype": "message_replied", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "message": {"thread_ts": "1485975824.000004", "text": "generally, yep!", "ts": "1485975824.000004", "reply_count": 1, "user": "U407ABLLW", "replies": [{"user": "U407ABLLW", "ts": "1485975835.000005"}], "type": "message"}, "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975842.1-message.json b/_pytest/data/websocket/1485975842.1-message.json
index c8b202b..b94a913 100644
--- a/_pytest/data/websocket/1485975842.1-message.json
+++ b/_pytest/data/websocket/1485975842.1-message.json
@@ -1 +1 @@
-{u'thread_ts': u'1485975824.000004', u'text': u'react if yes', u'ts': u'1485975841.000007', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"thread_ts": "1485975824.000004", "text": "react if yes", "ts": "1485975841.000007", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975842.18-message.json b/_pytest/data/websocket/1485975842.18-message.json
index d77fd22..7bc2b38 100644
--- a/_pytest/data/websocket/1485975842.18-message.json
+++ b/_pytest/data/websocket/1485975842.18-message.json
@@ -1 +1 @@
-{u'event_ts': u'1485975841.883922', u'ts': u'1485975841.000008', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'subtype': u'message_replied', u'message': {u'thread_ts': u'1485975824.000004', u'text': u'generally, yep!', u'ts': u'1485975824.000004', u'reply_count': 2, u'user': u'U407ABLLW', u'replies': [{u'user': u'U407ABLLW', u'ts': u'1485975835.000005'}, {u'user': u'U407ABLLW', u'ts': u'1485975841.000007'}], u'type': u'message'}, u'type': u'message', u'hidden': True, u'channel': u'C407ABS94'} \ No newline at end of file
+{"hidden": true, "event_ts": "1485975841.883922", "ts": "1485975841.000008", "subtype": "message_replied", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "message": {"thread_ts": "1485975824.000004", "text": "generally, yep!", "ts": "1485975824.000004", "reply_count": 2, "user": "U407ABLLW", "replies": [{"user": "U407ABLLW", "ts": "1485975835.000005"}, {"user": "U407ABLLW", "ts": "1485975841.000007"}], "type": "message"}, "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485975850.32-mpim_open.json b/_pytest/data/websocket/1485975850.32-mpim_open.json
index 908ee49..ebce13e 100644
--- a/_pytest/data/websocket/1485975850.32-mpim_open.json
+++ b/_pytest/data/websocket/1485975850.32-mpim_open.json
@@ -1 +1 @@
-{u'event_ts': u'1485975849.884091', u'is_mpim': True, u'user': u'U3ZKBBDL5', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'mpim_open', u'channel': u'G3ZGMF4RZ'} \ No newline at end of file
+{"event_ts": "1485975849.884091", "is_mpim": true, "user": "U3ZKBBDL5", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "mpim_open", "channel": "G3ZGMF4RZ"}
diff --git a/_pytest/data/websocket/1485975850.45-group_open.json b/_pytest/data/websocket/1485975850.45-group_open.json
index 60dd1d4..beb27d3 100644
--- a/_pytest/data/websocket/1485975850.45-group_open.json
+++ b/_pytest/data/websocket/1485975850.45-group_open.json
@@ -1 +1 @@
-{u'event_ts': u'1485975849.884092', u'is_mpim': True, u'user': u'U3ZKBBDL5', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'group_open', u'channel': u'G3ZGMF4RZ'} \ No newline at end of file
+{"event_ts": "1485975849.884092", "is_mpim": true, "user": "U3ZKBBDL5", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "group_open", "channel": "G3ZGMF4RZ"}
diff --git a/_pytest/data/websocket/1485975858.56-reaction_added.json b/_pytest/data/websocket/1485975858.56-reaction_added.json
index 6b10607..978d30f 100644
--- a/_pytest/data/websocket/1485975858.56-reaction_added.json
+++ b/_pytest/data/websocket/1485975858.56-reaction_added.json
@@ -1 +1 @@
-{u'reaction': u'stuck_out_tongue', u'event_ts': u'1485975858.884268', u'item': {u'type': u'message', u'ts': u'1485975841.000007', u'channel': u'C407ABS94'}, u'user': u'U4096CBHC', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_added'} \ No newline at end of file
+{"reaction": "stuck_out_tongue", "event_ts": "1485975858.884268", "item": {"type": "message", "ts": "1485975841.000007", "channel": "C407ABS94"}, "user": "U4096CBHC", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_added"}
diff --git a/_pytest/data/websocket/1485975890.7-bot_added.json b/_pytest/data/websocket/1485975890.7-bot_added.json
index 8ca953b..91254cf 100644
--- a/_pytest/data/websocket/1485975890.7-bot_added.json
+++ b/_pytest/data/websocket/1485975890.7-bot_added.json
@@ -1 +1 @@
-{u'event_ts': u'1485975890.885679', u'bot': {u'deleted': False, u'icons': {u'image_36': u'https://a.slack-edge.com/12b5a/plugins/tester/assets/service_36.png', u'image_48': u'https://a.slack-edge.com/12b5a/plugins/tester/assets/service_48.png', u'image_72': u'https://a.slack-edge.com/12b5a/plugins/tester/assets/service_72.png'}, u'app_id': u'A0F7XDUAZ', u'id': u'B3YTBU6L8', u'name': u'incoming-webhook'}, u'cache_ts': 1485975890, u'type': u'bot_added', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}} \ No newline at end of file
+{"event_ts": "1485975890.885679", "type": "bot_added", "cache_ts": 1485975890, "bot": {"deleted": false, "id": "B3YTBU6L8", "app_id": "A0F7XDUAZ", "name": "incoming-webhook", "icons": {"image_36": "https://a.slack-edge.com/12b5a/plugins/tester/assets/service_36.png", "image_48": "https://a.slack-edge.com/12b5a/plugins/tester/assets/service_48.png", "image_72": "https://a.slack-edge.com/12b5a/plugins/tester/assets/service_72.png"}}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}}
diff --git a/_pytest/data/websocket/1485975890.78-message.json b/_pytest/data/websocket/1485975890.78-message.json
index 414f544..785faa6 100644
--- a/_pytest/data/websocket/1485975890.78-message.json
+++ b/_pytest/data/websocket/1485975890.78-message.json
@@ -1 +1 @@
-{u'text': u'added an integration to this channel: <https://weeslacktest.slack.com/services/B3YTBU6L8|incoming-webhook>', u'ts': u'1485975890.000009', u'subtype': u'bot_add', u'user': u'U4096CBHC', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94', u'bot_id': u'B3YTBU6L8'} \ No newline at end of file
+{"text": "added an integration to this channel: <https://weeslacktest.slack.com/services/B3YTBU6L8|incoming-webhook>", "ts": "1485975890.000009", "subtype": "bot_add", "user": "U4096CBHC", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94", "bot_id": "B3YTBU6L8"}
diff --git a/_pytest/data/websocket/1485975896.16-message.json b/_pytest/data/websocket/1485975896.16-message.json
index 2d0499f..3a9db89 100644
--- a/_pytest/data/websocket/1485975896.16-message.json
+++ b/_pytest/data/websocket/1485975896.16-message.json
@@ -1 +1 @@
-{u'text': u'disabled an integration in this channel: <https://weeslacktest.slack.com/services/B3YTBU6L8|incoming-webhook>', u'ts': u'1485975896.000010', u'subtype': u'bot_disable', u'user': u'U4096CBHC', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94', u'bot_id': u'B3YTBU6L8'} \ No newline at end of file
+{"text": "disabled an integration in this channel: <https://weeslacktest.slack.com/services/B3YTBU6L8|incoming-webhook>", "ts": "1485975896.000010", "subtype": "bot_disable", "user": "U4096CBHC", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94", "bot_id": "B3YTBU6L8"}
diff --git a/_pytest/data/websocket/1485975907.84-reconnect_url.json b/_pytest/data/websocket/1485975907.84-reconnect_url.json
index f26d883..a2f99c1 100644
--- a/_pytest/data/websocket/1485975907.84-reconnect_url.json
+++ b/_pytest/data/websocket/1485975907.84-reconnect_url.json
@@ -1 +1 @@
-{u'url': u'wss://mpmulti-1r8c.slack-msgs.com/websocket/8atJCMnYZ10YaqNai-zwEaNMfkwh85XwRpc0MYVVOzAojnPcrx8SboF-NBWeep6Hy7arytqEffr_Fh7mPrDagwEGwbOeX-OH3OLlubVjpC2cCLWwm2jN3rEZcq8A4j0tpPP56GZ84jbLn4BKvDhKkkKhRXQhuYtC7kskaXXLTbk=', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reconnect_url'} \ No newline at end of file
+{"url": "wss://mpmulti-1r8c.slack-msgs.com/websocket/8atJCMnYZ10YaqNai-zwEaNMfkwh85XwRpc0MYVVOzAojnPcrx8SboF-NBWeep6Hy7arytqEffr_Fh7mPrDagwEGwbOeX-OH3OLlubVjpC2cCLWwm2jN3rEZcq8A4j0tpPP56GZ84jbLn4BKvDhKkkKhRXQhuYtC7kskaXXLTbk=", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reconnect_url"}
diff --git a/_pytest/data/websocket/1485975926.59-user_change.json b/_pytest/data/websocket/1485975926.59-user_change.json
index f3ef251..179a67d 100644
--- a/_pytest/data/websocket/1485975926.59-user_change.json
+++ b/_pytest/data/websocket/1485975926.59-user_change.json
@@ -1 +1 @@
-{u'event_ts': u'1485975926.886492', u'cache_ts': 1485975926, u'type': u'user_change', u'user': {u'status': None, u'profile': {u'first_name': u'Charles', u'last_name': u'Testuser', u'fields': [], u'real_name': u'Charles Testuser', u'image_24': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_original': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_original.png', u'real_name_normalized': u'Charles Testuser', u'image_512': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_32': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_48': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_72': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'avatar_hash': u'5af404f7d4b7', u'image_1024': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_192': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png'}, u'tz': u'America/Los_Angeles', u'name': u'charles', u'deleted': False, u'is_bot': False, u'tz_label': u'Pacific Standard Time', u'real_name': u'Charles Testuser', u'color': u'e7392d', u'team_id': u'T3YS5EAL9', u'is_admin': False, u'is_ultra_restricted': False, u'is_restricted': False, u'is_owner': False, u'tz_offset': -28800, u'id': u'U4096CBHC', u'is_primary_owner': False}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}} \ No newline at end of file
+{"event_ts": "1485975926.886492", "cache_ts": 1485975926, "type": "user_change", "user": {"status": null, "profile": {"first_name": "Charles", "last_name": "Testuser", "fields": [], "real_name": "Charles Testuser", "image_24": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_original": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_original.png", "real_name_normalized": "Charles Testuser", "image_512": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_32": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_48": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "avatar_hash": "5af404f7d4b7", "image_72": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_1024": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_192": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png"}, "tz": "America/Los_Angeles", "name": "charles", "deleted": false, "is_bot": false, "tz_label": "Pacific Standard Time", "real_name": "Charles Testuser", "color": "e7392d", "team_id": "T3YS5EAL9", "is_admin": false, "is_ultra_restricted": false, "is_restricted": false, "tz_offset": -28800, "is_primary_owner": false, "id": "U4096CBHC", "is_owner": false}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}}
diff --git a/_pytest/data/websocket/1485975930.81-user_change.json b/_pytest/data/websocket/1485975930.81-user_change.json
index 40ed3da..afbbb1b 100644
--- a/_pytest/data/websocket/1485975930.81-user_change.json
+++ b/_pytest/data/websocket/1485975930.81-user_change.json
@@ -1 +1 @@
-{u'event_ts': u'1485975930.886576', u'cache_ts': 1485975930, u'type': u'user_change', u'user': {u'status': None, u'profile': {u'first_name': u'Charles', u'last_name': u'Testuser', u'fields': [], u'real_name': u'Charles Testuser', u'image_24': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_original': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_original.png', u'real_name_normalized': u'Charles Testuser', u'image_512': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_32': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_48': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_72': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'avatar_hash': u'5af404f7d4b7', u'image_1024': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png', u'image_192': u'https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png'}, u'tz': u'America/Los_Angeles', u'name': u'charles', u'deleted': False, u'is_bot': False, u'tz_label': u'Pacific Standard Time', u'real_name': u'Charles Testuser', u'color': u'e7392d', u'team_id': u'T3YS5EAL9', u'is_admin': False, u'is_ultra_restricted': False, u'is_restricted': False, u'is_owner': False, u'tz_offset': -28800, u'id': u'U4096CBHC', u'is_primary_owner': False}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}} \ No newline at end of file
+{"event_ts": "1485975930.886576", "cache_ts": 1485975930, "type": "user_change", "user": {"status": null, "profile": {"first_name": "Charles", "last_name": "Testuser", "fields": [], "real_name": "Charles Testuser", "image_24": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_original": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_original.png", "real_name_normalized": "Charles Testuser", "image_512": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_32": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_48": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "avatar_hash": "5af404f7d4b7", "image_72": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_1024": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png", "image_192": "https://avatars.slack-edge.com/2017-02-01/135714629508_5af404f7d4b7728d10c0_24.png"}, "tz": "America/Los_Angeles", "name": "charles", "deleted": false, "is_bot": false, "tz_label": "Pacific Standard Time", "real_name": "Charles Testuser", "color": "e7392d", "team_id": "T3YS5EAL9", "is_admin": false, "is_ultra_restricted": false, "is_restricted": false, "tz_offset": -28800, "is_primary_owner": false, "id": "U4096CBHC", "is_owner": false}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}}
diff --git a/_pytest/data/websocket/1485975956.38-file_public.json b/_pytest/data/websocket/1485975956.38-file_public.json
index 3f44646..288b528 100644
--- a/_pytest/data/websocket/1485975956.38-file_public.json
+++ b/_pytest/data/websocket/1485975956.38-file_public.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975956.887078', u'file_id': u'F3ZJQTA66', u'file': {u'id': u'F3ZJQTA66'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_public'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975956.887078", "file_id": "F3ZJQTA66", "file": {"id": "F3ZJQTA66"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_public"}
diff --git a/_pytest/data/websocket/1485975956.47-file_shared.json b/_pytest/data/websocket/1485975956.47-file_shared.json
index 53296ba..1064ac7 100644
--- a/_pytest/data/websocket/1485975956.47-file_shared.json
+++ b/_pytest/data/websocket/1485975956.47-file_shared.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975956.887081', u'file_id': u'F3ZJQTA66', u'file': {u'id': u'F3ZJQTA66'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_shared'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975956.887081", "file_id": "F3ZJQTA66", "file": {"id": "F3ZJQTA66"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_shared"}
diff --git a/_pytest/data/websocket/1485975956.47-message.json b/_pytest/data/websocket/1485975956.47-message.json
index 03047f4..04e67a8 100644
--- a/_pytest/data/websocket/1485975956.47-message.json
+++ b/_pytest/data/websocket/1485975956.47-message.json
@@ -1 +1 @@
-{u'username': u'<@U407ABLLW|alice>', u'source_team': u'T3YS5EAL9', u'display_as_bot': False, u'text': u'<@U407ABLLW|alice> uploaded a file: <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>', u'channel': u'C407ABS94', u'user_profile': {u'avatar_hash': u'gfd0ce7a168d', u'first_name': u'First', u'real_name': u'First Testuser', u'name': u'alice', u'image_72': u'https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png'}, u'upload': True, u'ts': u'1485975956.000011', u'subtype': u'file_share', u'user': u'U407ABLLW', u'file': {u'groups': [], u'filetype': u'png', u'channels': [u'C407ABS94'], u'display_as_bot': False, u'thumb_64': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png', u'size': 68, u'original_h': 1, u'thumb_360_w': 1, u'title': u'1x1.png', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png', u'thumb_360': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png', u'id': u'F3ZJQTA66', u'ims': [], u'thumb_80': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png', u'thumb_360_h': 1, u'external_type': u'', u'username': u'', u'timestamp': 1485975955, u'public_url_shared': False, u'editable': False, u'thumb_160': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png', u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png', u'user': u'U407ABLLW', u'image_exif_rotation': 1, u'is_public': True, u'pretty_type': u'PNG', u'name': u'1x1.png', u'mimetype': u'image/png', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png', u'is_external': False, u'created': 1485975955, u'original_w': 1, u'comments_count': 0, u'mode': u'hosted'}, u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'user_team': u'T3YS5EAL9', u'bot_id': None} \ No newline at end of file
+{"username": "<@U407ABLLW|alice>", "source_team": "T3YS5EAL9", "user_profile": {"avatar_hash": "gfd0ce7a168d", "first_name": "First", "image_72": "https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=72&d=https%3A%2F%2Fa.slack-edge.com%2F66f9%2Fimg%2Favatars%2Fava_0024-72.png", "name": "alice", "real_name": "First Testuser"}, "text": "<@U407ABLLW|alice> uploaded a file: <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>", "team": "T3YS5EAL9", "upload": true, "ts": "1485975956.000011", "display_as_bot": false, "user": "U407ABLLW", "file": {"image_exif_rotation": 1, "filetype": "png", "channels": ["C407ABS94"], "display_as_bot": false, "id": "F3ZJQTA66", "size": 68, "original_h": 1, "thumb_360_w": 1, "title": "1x1.png", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png", "thumb_360": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png", "thumb_64": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png", "ims": [], "thumb_80": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png", "thumb_360_h": 1, "external_type": "", "username": "", "timestamp": 1485975955, "public_url_shared": false, "editable": false, "thumb_160": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png", "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png", "user": "U407ABLLW", "groups": [], "is_public": true, "pretty_type": "PNG", "is_external": false, "mimetype": "image/png", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2", "permalink": "https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png", "name": "1x1.png", "created": 1485975955, "original_w": 1, "comments_count": 0, "mode": "hosted"}, "subtype": "file_share", "user_team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94", "bot_id": null}
diff --git a/_pytest/data/websocket/1485975978.79-message.json b/_pytest/data/websocket/1485975978.79-message.json
index 339504c..f7c1846 100644
--- a/_pytest/data/websocket/1485975978.79-message.json
+++ b/_pytest/data/websocket/1485975978.79-message.json
@@ -1 +1 @@
-{u'username': u'<@U407ABLLW|alice>', u'display_as_bot': False, u'text': u'<@U407ABLLW|alice> shared a file: <https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here|some post here>', u'upload': False, u'ts': u'1485975978.000012', u'subtype': u'file_share', u'user': u'U407ABLLW', u'file': {u'filetype': u'space', u'channels': [u'C407ABS94'], u'display_as_bot': False, u'id': u'F3YTCL8TA', u'size': 73, u'title': u'some post here', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/some_post_here', u'ims': [], u'state': u'locked', u'editor': u'U407ABLLW', u'preview': None, u'external_type': u'', u'username': u'', u'updated': 1485975959, u'timestamp': 1485975967, u'public_url_shared': False, u'editable': True, u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/download/some_post_here', u'user': u'U407ABLLW', u'groups': [], u'is_public': False, u'last_editor': u'U407ABLLW', u'pretty_type': u'Post', u'name': u'some_post_here', u'mimetype': u'text/plain', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3YTCL8TA-9d9391a713', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here', u'is_external': False, u'created': 1485975959, u'comments_count': 0, u'mode': u'space'}, u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94', u'bot_id': None} \ No newline at end of file
+{"username": "<@U407ABLLW|alice>", "subtype": "file_share", "text": "<@U407ABLLW|alice> shared a file: <https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here|some post here>", "upload": false, "ts": "1485975978.000012", "display_as_bot": false, "user": "U407ABLLW", "file": {"filetype": "space", "channels": ["C407ABS94"], "display_as_bot": false, "id": "F3YTCL8TA", "size": 73, "title": "some post here", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/some_post_here", "ims": [], "state": "locked", "editor": "U407ABLLW", "preview": null, "external_type": "", "username": "", "updated": 1485975959, "timestamp": 1485975967, "public_url_shared": false, "editable": true, "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/download/some_post_here", "user": "U407ABLLW", "groups": [], "is_public": false, "last_editor": "U407ABLLW", "pretty_type": "Post", "is_external": false, "mimetype": "text/plain", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3YTCL8TA-9d9391a713", "permalink": "https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here", "name": "some_post_here", "created": 1485975959, "comments_count": 0, "mode": "space"}, "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94", "bot_id": null}
diff --git a/_pytest/data/websocket/1485975978.91-file_public.json b/_pytest/data/websocket/1485975978.91-file_public.json
index 39ad780..820f802 100644
--- a/_pytest/data/websocket/1485975978.91-file_public.json
+++ b/_pytest/data/websocket/1485975978.91-file_public.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975978.887563', u'file_id': u'F3YTCL8TA', u'file': {u'id': u'F3YTCL8TA'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_public'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975978.887563", "file_id": "F3YTCL8TA", "file": {"id": "F3YTCL8TA"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_public"}
diff --git a/_pytest/data/websocket/1485975978.91-file_shared.json b/_pytest/data/websocket/1485975978.91-file_shared.json
index e41c2be..ede98ba 100644
--- a/_pytest/data/websocket/1485975978.91-file_shared.json
+++ b/_pytest/data/websocket/1485975978.91-file_shared.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975978.887560', u'file_id': u'F3YTCL8TA', u'file': {u'id': u'F3YTCL8TA'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_shared'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975978.887560", "file_id": "F3YTCL8TA", "file": {"id": "F3YTCL8TA"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_shared"}
diff --git a/_pytest/data/websocket/1485975995.98-file_change.json b/_pytest/data/websocket/1485975995.98-file_change.json
index ff4ea71..9744692 100644
--- a/_pytest/data/websocket/1485975995.98-file_change.json
+++ b/_pytest/data/websocket/1485975995.98-file_change.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975995.887846', u'file_id': u'F3YTCL8TA', u'file': {u'id': u'F3YTCL8TA'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_change'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975995.887846", "file_id": "F3YTCL8TA", "file": {"id": "F3YTCL8TA"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_change"}
diff --git a/_pytest/data/websocket/1485975998.13-file_change.json b/_pytest/data/websocket/1485975998.13-file_change.json
index bbbc4ec..8933dd7 100644
--- a/_pytest/data/websocket/1485975998.13-file_change.json
+++ b/_pytest/data/websocket/1485975998.13-file_change.json
@@ -1 +1 @@
-{u'user_id': u'U407ABLLW', u'event_ts': u'1485975998.887906', u'file_id': u'F3YTCL8TA', u'file': {u'id': u'F3YTCL8TA'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_change'} \ No newline at end of file
+{"user_id": "U407ABLLW", "event_ts": "1485975998.887906", "file_id": "F3YTCL8TA", "file": {"id": "F3YTCL8TA"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_change"}
diff --git a/_pytest/data/websocket/1485976002.57-file_deleted.json b/_pytest/data/websocket/1485976002.57-file_deleted.json
index a4f4c71..34719d0 100644
--- a/_pytest/data/websocket/1485976002.57-file_deleted.json
+++ b/_pytest/data/websocket/1485976002.57-file_deleted.json
@@ -1 +1 @@
-{u'event_ts': u'1485976002.888005', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_deleted', u'file_id': u'F3YTCL8TA'} \ No newline at end of file
+{"event_ts": "1485976002.888005", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_deleted", "file_id": "F3YTCL8TA"}
diff --git a/_pytest/data/websocket/1485976002.66-message.json b/_pytest/data/websocket/1485976002.66-message.json
index b32f31a..cb7bc08 100644
--- a/_pytest/data/websocket/1485976002.66-message.json
+++ b/_pytest/data/websocket/1485976002.66-message.json
@@ -1 +1 @@
-{u'event_ts': u'1485976002.888006', u'ts': u'1485976002.000013', u'subtype': u'message_deleted', u'hidden': True, u'deleted_ts': u'1485975978.000012', u'type': u'message', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'channel': u'C407ABS94', u'previous_message': {u'username': u'<@U407ABLLW|alice>', u'display_as_bot': False, u'text': u'<@U407ABLLW|alice> shared a file: <https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here|some post here>', u'upload': False, u'ts': u'1485975978.000012', u'subtype': u'file_share', u'user': u'U407ABLLW', u'file': {u'filetype': u'space', u'channels': [], u'display_as_bot': False, u'id': u'F3YTCL8TA', u'size': 73, u'title': u'some post here', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/some_post_here', u'ims': [], u'state': u'locked', u'editor': u'U407ABLLW', u'preview': None, u'external_type': u'', u'username': u'', u'updated': 1485975959, u'timestamp': 1485975967, u'public_url_shared': False, u'editable': True, u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/download/some_post_here', u'user': u'U407ABLLW', u'groups': [], u'is_public': True, u'last_editor': u'U407ABLLW', u'pretty_type': u'Post', u'name': u'some_post_here', u'mimetype': u'text/plain', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3YTCL8TA-9d9391a713', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here', u'is_external': False, u'created': 1485975959, u'comments_count': 0, u'mode': u'space'}, u'type': u'message', u'bot_id': None}} \ No newline at end of file
+{"event_ts": "1485976002.888006", "ts": "1485976002.000013", "subtype": "message_deleted", "hidden": true, "previous_message": {"username": "<@U407ABLLW|alice>", "subtype": "file_share", "text": "<@U407ABLLW|alice> shared a file: <https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here|some post here>", "upload": false, "ts": "1485975978.000012", "display_as_bot": false, "user": "U407ABLLW", "file": {"filetype": "space", "channels": [], "display_as_bot": false, "id": "F3YTCL8TA", "size": 73, "title": "some post here", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/some_post_here", "ims": [], "state": "locked", "editor": "U407ABLLW", "preview": null, "external_type": "", "username": "", "updated": 1485975959, "timestamp": 1485975967, "public_url_shared": false, "editable": true, "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3YTCL8TA/download/some_post_here", "user": "U407ABLLW", "groups": [], "is_public": true, "last_editor": "U407ABLLW", "pretty_type": "Post", "is_external": false, "mimetype": "text/plain", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3YTCL8TA-9d9391a713", "permalink": "https://weeslacktest.slack.com/files/alice/F3YTCL8TA/some_post_here", "name": "some_post_here", "created": 1485975959, "comments_count": 0, "mode": "space"}, "type": "message", "bot_id": null}, "type": "message", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "channel": "C407ABS94", "deleted_ts": "1485975978.000012"}
diff --git a/_pytest/data/websocket/1485976024.46-user_typing.json b/_pytest/data/websocket/1485976024.46-user_typing.json
index b909fa3..b8239d4 100644
--- a/_pytest/data/websocket/1485976024.46-user_typing.json
+++ b/_pytest/data/websocket/1485976024.46-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'G3ZGMF4RZ'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "G3ZGMF4RZ"}
diff --git a/_pytest/data/websocket/1485976028.31-user_typing.json b/_pytest/data/websocket/1485976028.31-user_typing.json
index b7f65a8..8307f14 100644
--- a/_pytest/data/websocket/1485976028.31-user_typing.json
+++ b/_pytest/data/websocket/1485976028.31-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'G3ZJKP7GA'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "G3ZJKP7GA"}
diff --git a/_pytest/data/websocket/1485976039.32-reaction_added.json b/_pytest/data/websocket/1485976039.32-reaction_added.json
index acccc65..864ea68 100644
--- a/_pytest/data/websocket/1485976039.32-reaction_added.json
+++ b/_pytest/data/websocket/1485976039.32-reaction_added.json
@@ -1 +1 @@
-{u'reaction': u'unamused', u'event_ts': u'1485976039.888795', u'item': {u'type': u'message', u'ts': u'1485975841.000007', u'channel': u'C407ABS94'}, u'user': u'U407ABLLW', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_added'} \ No newline at end of file
+{"reaction": "unamused", "event_ts": "1485976039.888795", "item": {"type": "message", "ts": "1485975841.000007", "channel": "C407ABS94"}, "user": "U407ABLLW", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_added"}
diff --git a/_pytest/data/websocket/1485976040.8-reaction_removed.json b/_pytest/data/websocket/1485976040.8-reaction_removed.json
index 2f39d43..3553a10 100644
--- a/_pytest/data/websocket/1485976040.8-reaction_removed.json
+++ b/_pytest/data/websocket/1485976040.8-reaction_removed.json
@@ -1 +1 @@
-{u'reaction': u'unamused', u'event_ts': u'1485976040.888829', u'item': {u'type': u'message', u'ts': u'1485975841.000007', u'channel': u'C407ABS94'}, u'user': u'U407ABLLW', u'item_user': u'U407ABLLW', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reaction_removed'} \ No newline at end of file
+{"reaction": "unamused", "event_ts": "1485976040.888829", "item": {"type": "message", "ts": "1485975841.000007", "channel": "C407ABS94"}, "user": "U407ABLLW", "item_user": "U407ABLLW", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reaction_removed"}
diff --git a/_pytest/data/websocket/1485976087.84-reconnect_url.json b/_pytest/data/websocket/1485976087.84-reconnect_url.json
index 018c2c5..40308ce 100644
--- a/_pytest/data/websocket/1485976087.84-reconnect_url.json
+++ b/_pytest/data/websocket/1485976087.84-reconnect_url.json
@@ -1 +1 @@
-{u'url': u'wss://mpmulti-clcz.slack-msgs.com/websocket/ZwLc8-LUIYLyvEwRO5WKs99SLtxBN9Cyu1W5qmqkre0AtWFl_H8xTE7HbF0E9LUvgI4bNkIRG8WgPxIzfr5gLJsU6vg8By36_mUUZYfH0TV65y_h2vV7NQe6s3A6WJdKRoJAe_EI2AN5L-VeL9rK1Ygc0nw3ngmuL78G6cm48xw=', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reconnect_url'} \ No newline at end of file
+{"url": "wss://mpmulti-clcz.slack-msgs.com/websocket/ZwLc8-LUIYLyvEwRO5WKs99SLtxBN9Cyu1W5qmqkre0AtWFl_H8xTE7HbF0E9LUvgI4bNkIRG8WgPxIzfr5gLJsU6vg8By36_mUUZYfH0TV65y_h2vV7NQe6s3A6WJdKRoJAe_EI2AN5L-VeL9rK1Ygc0nw3ngmuL78G6cm48xw=", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reconnect_url"}
diff --git a/_pytest/data/websocket/1485976107.57-channel_created.json b/_pytest/data/websocket/1485976107.57-channel_created.json
index fed2059..b061743 100644
--- a/_pytest/data/websocket/1485976107.57-channel_created.json
+++ b/_pytest/data/websocket/1485976107.57-channel_created.json
@@ -1 +1 @@
-{u'event_ts': u'1485976107.890695', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_created', u'channel': {u'is_shared': False, u'is_channel': True, u'created': 1485976107, u'creator': u'U407ABLLW', u'is_org_shared': False, u'id': u'C3ZM2GMGU', u'name': u'made-to-be-archived'}} \ No newline at end of file
+{"event_ts": "1485976107.890695", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_created", "channel": {"is_shared": false, "is_channel": true, "creator": "U407ABLLW", "created": 1485976107, "is_org_shared": false, "id": "C3ZM2GMGU", "name": "made-to-be-archived"}}
diff --git a/_pytest/data/websocket/1485976114.72-user_typing.json b/_pytest/data/websocket/1485976114.72-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976114.72-user_typing.json
+++ b/_pytest/data/websocket/1485976114.72-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976117.99-user_typing.json b/_pytest/data/websocket/1485976117.99-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976117.99-user_typing.json
+++ b/_pytest/data/websocket/1485976117.99-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976124.9-user_typing.json b/_pytest/data/websocket/1485976124.9-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976124.9-user_typing.json
+++ b/_pytest/data/websocket/1485976124.9-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976124.98-message.json b/_pytest/data/websocket/1485976124.98-message.json
index 95a8d77..26ce4e5 100644
--- a/_pytest/data/websocket/1485976124.98-message.json
+++ b/_pytest/data/websocket/1485976124.98-message.json
@@ -1 +1 @@
-{u'text': u'referencing someong by <@U3ZKBBDL5> name', u'ts': u'1485976124.000014', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"text": "referencing someong by <@U3ZKBBDL5> name", "ts": "1485976124.000014", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976125.06-desktop_notification.json b/_pytest/data/websocket/1485976125.06-desktop_notification.json
index 3a57bc0..ddd6dff 100644
--- a/_pytest/data/websocket/1485976125.06-desktop_notification.json
+++ b/_pytest/data/websocket/1485976125.06-desktop_notification.json
@@ -1 +1 @@
-{u'launchUri': u'slack://channel?id=C407ABS94&message=1485976124000014&team=T3YS5EAL9', u'subtitle': u'#general', u'is_shared': False, u'title': u'weeslacktest', u'ssbFilename': u'knock_brush.mp3', u'avatarImage': u'https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0024-192.png', u'imageUri': None, u'content': u'alice: referencing someong by @bob name', u'event_ts': u'1485976124.891186', u'msg': u'1485976124.000014', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'desktop_notification', u'channel': u'C407ABS94'} \ No newline at end of file
+{"avatarImage": "https://secure.gravatar.com/avatar/fd0ce7a168dc2235d21c53c2c1cfee0c.jpg?s=192&d=https%3A%2F%2Fa.slack-edge.com%2F7fa9%2Fimg%2Favatars%2Fava_0024-192.png", "subtitle": "#general", "is_shared": false, "title": "weeslacktest", "ssbFilename": "knock_brush.mp3", "imageUri": null, "launchUri": "slack://channel?id=C407ABS94&message=1485976124000014&team=T3YS5EAL9", "event_ts": "1485976124.891186", "msg": "1485976124.000014", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "content": "alice: referencing someong by @bob name", "type": "desktop_notification", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976125.95-user_typing.json b/_pytest/data/websocket/1485976125.95-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976125.95-user_typing.json
+++ b/_pytest/data/websocket/1485976125.95-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976129.49-user_typing.json b/_pytest/data/websocket/1485976129.49-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976129.49-user_typing.json
+++ b/_pytest/data/websocket/1485976129.49-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976133.0-user_typing.json b/_pytest/data/websocket/1485976133.0-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976133.0-user_typing.json
+++ b/_pytest/data/websocket/1485976133.0-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976137.51-user_typing.json b/_pytest/data/websocket/1485976137.51-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976137.51-user_typing.json
+++ b/_pytest/data/websocket/1485976137.51-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976137.95-message.json b/_pytest/data/websocket/1485976137.95-message.json
index 715e4e4..f4579e5 100644
--- a/_pytest/data/websocket/1485976137.95-message.json
+++ b/_pytest/data/websocket/1485976137.95-message.json
@@ -1 +1 @@
-{u'text': u'referencing someone else by <@U407ABLLW> name', u'ts': u'1485976137.000015', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"text": "referencing someone else by <@U407ABLLW> name", "ts": "1485976137.000015", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976138.73-user_typing.json b/_pytest/data/websocket/1485976138.73-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976138.73-user_typing.json
+++ b/_pytest/data/websocket/1485976138.73-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976141.79-user_typing.json b/_pytest/data/websocket/1485976141.79-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976141.79-user_typing.json
+++ b/_pytest/data/websocket/1485976141.79-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976145.8-user_typing.json b/_pytest/data/websocket/1485976145.8-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976145.8-user_typing.json
+++ b/_pytest/data/websocket/1485976145.8-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976149.89-user_typing.json b/_pytest/data/websocket/1485976149.89-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976149.89-user_typing.json
+++ b/_pytest/data/websocket/1485976149.89-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976151.6-message.json b/_pytest/data/websocket/1485976151.6-message.json
index a2f431e..7efa65d 100644
--- a/_pytest/data/websocket/1485976151.6-message.json
+++ b/_pytest/data/websocket/1485976151.6-message.json
@@ -1 +1 @@
-{u'text': u'referencing a #channel-that-doesnt-exist', u'ts': u'1485976151.000016', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"text": "referencing a #channel-that-doesnt-exist", "ts": "1485976151.000016", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976157.18-message.json b/_pytest/data/websocket/1485976157.18-message.json
index 96c82f6..62244b4 100644
--- a/_pytest/data/websocket/1485976157.18-message.json
+++ b/_pytest/data/websocket/1485976157.18-message.json
@@ -1 +1 @@
-{u'event_ts': u'1485976156.891735', u'ts': u'1485976156.000017', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'subtype': u'message_changed', u'message': {u'text': u'referencing a <#C407ABS94|general>', u'type': u'message', u'user': u'U407ABLLW', u'ts': u'1485976151.000016', u'edited': {u'user': u'U407ABLLW', u'ts': u'1485976157.000000'}}, u'type': u'message', u'hidden': True, u'channel': u'C407ABS94', u'previous_message': {u'text': u'referencing a #channel-that-doesnt-exist', u'type': u'message', u'user': u'U407ABLLW', u'ts': u'1485976151.000016'}} \ No newline at end of file
+{"hidden": true, "event_ts": "1485976156.891735", "ts": "1485976156.000017", "subtype": "message_changed", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "message": {"text": "referencing a <#C407ABS94|general>", "edited": {"user": "U407ABLLW", "ts": "1485976157.000000"}, "type": "message", "user": "U407ABLLW", "ts": "1485976151.000016"}, "channel": "C407ABS94", "previous_message": {"text": "referencing a #channel-that-doesnt-exist", "type": "message", "user": "U407ABLLW", "ts": "1485976151.000016"}}
diff --git a/_pytest/data/websocket/1485976157.8-user_typing.json b/_pytest/data/websocket/1485976157.8-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976157.8-user_typing.json
+++ b/_pytest/data/websocket/1485976157.8-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976161.29-user_typing.json b/_pytest/data/websocket/1485976161.29-user_typing.json
index 4e53cd4..df57e72 100644
--- a/_pytest/data/websocket/1485976161.29-user_typing.json
+++ b/_pytest/data/websocket/1485976161.29-user_typing.json
@@ -1 +1 @@
-{'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'user_typing', u'user': u'U407ABLLW', u'channel': u'C407ABS94'} \ No newline at end of file
+{"wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "user_typing", "user": "U407ABLLW", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976161.75-message.json b/_pytest/data/websocket/1485976161.75-message.json
index 9ed97d2..f0b899b 100644
--- a/_pytest/data/websocket/1485976161.75-message.json
+++ b/_pytest/data/websocket/1485976161.75-message.json
@@ -1 +1 @@
-{u'text': u'referencing <#C3ZM8JTD3|some-channel2-renamed>', u'ts': u'1485976161.000018', u'user': u'U407ABLLW', u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"text": "referencing <#C3ZM8JTD3|some-channel2-renamed>", "ts": "1485976161.000018", "user": "U407ABLLW", "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976182.59-channel_archive.json b/_pytest/data/websocket/1485976182.59-channel_archive.json
index 66ce021..4ebdb1f 100644
--- a/_pytest/data/websocket/1485976182.59-channel_archive.json
+++ b/_pytest/data/websocket/1485976182.59-channel_archive.json
@@ -1 +1 @@
-{u'event_ts': u'1485976182.892242', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_archive', u'user': u'U407ABLLW', u'channel': u'C3ZM2GMGU'} \ No newline at end of file
+{"event_ts": "1485976182.892242", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_archive", "user": "U407ABLLW", "channel": "C3ZM2GMGU"}
diff --git a/_pytest/data/websocket/1485976186.62-channel_unarchive.json b/_pytest/data/websocket/1485976186.62-channel_unarchive.json
index 67f15d7..c95897d 100644
--- a/_pytest/data/websocket/1485976186.62-channel_unarchive.json
+++ b/_pytest/data/websocket/1485976186.62-channel_unarchive.json
@@ -1 +1 @@
-{u'event_ts': u'1485976186.892309', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'channel_unarchive', u'user': u'U407ABLLW', u'channel': u'C3ZM2GMGU'} \ No newline at end of file
+{"event_ts": "1485976186.892309", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "channel_unarchive", "user": "U407ABLLW", "channel": "C3ZM2GMGU"}
diff --git a/_pytest/data/websocket/1485976236.58-message.json b/_pytest/data/websocket/1485976236.58-message.json
index ea7ecef..f09b294 100644
--- a/_pytest/data/websocket/1485976236.58-message.json
+++ b/_pytest/data/websocket/1485976236.58-message.json
@@ -1 +1 @@
-{u'comment': {u'comment': u'first comment!', u'created': 1485976236, u'timestamp': 1485976236, u'is_intro': False, u'user': u'U407ABLLW', u'id': u'Fc3ZMDRQLV', u'channel': u''}, u'text': u'<@U407ABLLW|alice> commented on <@U407ABLLW|alice>\u2019s file <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>: first comment!', u'ts': u'1485976236.000019', u'subtype': u'file_comment', u'is_intro': False, u'file': {u'groups': [], u'filetype': u'png', u'channels': [u'C407ABS94'], u'display_as_bot': False, u'thumb_64': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png', u'size': 68, u'original_h': 1, u'thumb_360_w': 1, u'title': u'1x1.png', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png', u'thumb_360': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png', u'id': u'F3ZJQTA66', u'ims': [], u'thumb_80': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png', u'thumb_360_h': 1, u'external_type': u'', u'username': u'', u'timestamp': 1485975955, u'public_url_shared': False, u'editable': False, u'thumb_160': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png', u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png', u'user': u'U407ABLLW', u'image_exif_rotation': 1, u'is_public': True, u'pretty_type': u'PNG', u'name': u'1x1.png', u'mimetype': u'image/png', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png', u'is_external': False, u'created': 1485975955, u'original_w': 1, u'comments_count': 1, u'mode': u'hosted'}, u'team': u'T3YS5EAL9', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'message', u'channel': u'C407ABS94'} \ No newline at end of file
+{"comment": {"comment": "first comment!", "created": 1485976236, "timestamp": 1485976236, "is_intro": false, "user": "U407ABLLW", "id": "Fc3ZMDRQLV", "channel": ""}, "text": "<@U407ABLLW|alice> commented on <@U407ABLLW|alice>\u2019s file <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>: first comment!", "ts": "1485976236.000019", "subtype": "file_comment", "is_intro": false, "file": {"image_exif_rotation": 1, "filetype": "png", "channels": ["C407ABS94"], "display_as_bot": false, "id": "F3ZJQTA66", "size": 68, "original_h": 1, "thumb_360_w": 1, "title": "1x1.png", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png", "thumb_360": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png", "thumb_64": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png", "ims": [], "thumb_80": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png", "thumb_360_h": 1, "external_type": "", "username": "", "timestamp": 1485975955, "public_url_shared": false, "editable": false, "thumb_160": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png", "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png", "user": "U407ABLLW", "groups": [], "is_public": true, "pretty_type": "PNG", "is_external": false, "mimetype": "image/png", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2", "permalink": "https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png", "name": "1x1.png", "created": 1485975955, "original_w": 1, "comments_count": 1, "mode": "hosted"}, "team": "T3YS5EAL9", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "channel": "C407ABS94"}
diff --git a/_pytest/data/websocket/1485976236.67-file_comment_added.json b/_pytest/data/websocket/1485976236.67-file_comment_added.json
index 13272a8..82c1f0c 100644
--- a/_pytest/data/websocket/1485976236.67-file_comment_added.json
+++ b/_pytest/data/websocket/1485976236.67-file_comment_added.json
@@ -1 +1 @@
-{u'comment': {u'comment': u'first comment!', u'created': 1485976236, u'timestamp': 1485976236, u'is_intro': False, u'user': u'U407ABLLW', u'id': u'Fc3ZMDRQLV', u'channel': u''}, u'user_id': u'U407ABLLW', u'event_ts': u'1485976236.893560', u'file_id': u'F3ZJQTA66', u'file': {u'id': u'F3ZJQTA66'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_comment_added'} \ No newline at end of file
+{"comment": {"comment": "first comment!", "created": 1485976236, "timestamp": 1485976236, "is_intro": false, "user": "U407ABLLW", "id": "Fc3ZMDRQLV", "channel": ""}, "user_id": "U407ABLLW", "event_ts": "1485976236.893560", "file_id": "F3ZJQTA66", "file": {"id": "F3ZJQTA66"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_comment_added"}
diff --git a/_pytest/data/websocket/1485976248.57-message.json b/_pytest/data/websocket/1485976248.57-message.json
index 797e0dc..d3c8ce6 100644
--- a/_pytest/data/websocket/1485976248.57-message.json
+++ b/_pytest/data/websocket/1485976248.57-message.json
@@ -1 +1 @@
-{u'event_ts': u'1485976248.893799', u'ts': u'1485976248.000020', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'subtype': u'message_changed', u'message': {u'comment': {u'comment': u'first comment! now i edited it.', u'created': 1485976236, u'timestamp': 1485976236, u'is_intro': False, u'user': u'U407ABLLW', u'id': u'Fc3ZMDRQLV', u'channel': u''}, u'text': u'<@U407ABLLW|alice> commented on <@U407ABLLW|alice>\u2019s file <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>: first comment! now i edited it.', u'ts': u'1485976236.000019', u'subtype': u'file_comment', u'is_intro': False, u'file': {u'groups': [], u'filetype': u'png', u'channels': [u'C407ABS94'], u'display_as_bot': False, u'thumb_64': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png', u'size': 68, u'original_h': 1, u'thumb_360_w': 1, u'title': u'1x1.png', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png', u'thumb_360': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png', u'id': u'F3ZJQTA66', u'ims': [], u'thumb_80': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png', u'thumb_360_h': 1, u'external_type': u'', u'username': u'', u'timestamp': 1485975955, u'public_url_shared': False, u'editable': False, u'thumb_160': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png', u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png', u'user': u'U407ABLLW', u'image_exif_rotation': 1, u'is_public': True, u'pretty_type': u'PNG', u'name': u'1x1.png', u'mimetype': u'image/png', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png', u'is_external': False, u'created': 1485975955, u'original_w': 1, u'comments_count': 1, u'mode': u'hosted'}, u'type': u'message'}, u'type': u'message', u'hidden': True, u'channel': u'C407ABS94', u'previous_message': {u'comment': {u'comment': u'first comment! now i edited it.', u'created': 1485976236, u'timestamp': 1485976236, u'is_intro': False, u'user': u'U407ABLLW', u'id': u'Fc3ZMDRQLV', u'channel': u''}, u'text': u'<@U407ABLLW|alice> commented on <@U407ABLLW|alice>\u2019s file <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>: first comment! now i edited it.', u'ts': u'1485976236.000019', u'subtype': u'file_comment', u'is_intro': False, u'file': {u'groups': [], u'filetype': u'png', u'channels': [u'C407ABS94'], u'display_as_bot': False, u'thumb_64': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png', u'size': 68, u'original_h': 1, u'thumb_360_w': 1, u'title': u'1x1.png', u'url_private': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png', u'thumb_360': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png', u'id': u'F3ZJQTA66', u'ims': [], u'thumb_80': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png', u'thumb_360_h': 1, u'external_type': u'', u'username': u'', u'timestamp': 1485975955, u'public_url_shared': False, u'editable': False, u'thumb_160': u'https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png', u'url_private_download': u'https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png', u'user': u'U407ABLLW', u'image_exif_rotation': 1, u'is_public': True, u'pretty_type': u'PNG', u'name': u'1x1.png', u'mimetype': u'image/png', u'permalink_public': u'https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2', u'permalink': u'https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png', u'is_external': False, u'created': 1485975955, u'original_w': 1, u'comments_count': 1, u'mode': u'hosted'}, u'type': u'message'}} \ No newline at end of file
+{"hidden": true, "event_ts": "1485976248.893799", "ts": "1485976248.000020", "subtype": "message_changed", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "message", "message": {"comment": {"comment": "first comment! now i edited it.", "created": 1485976236, "timestamp": 1485976236, "is_intro": false, "user": "U407ABLLW", "id": "Fc3ZMDRQLV", "channel": ""}, "text": "<@U407ABLLW|alice> commented on <@U407ABLLW|alice>\u2019s file <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>: first comment! now i edited it.", "ts": "1485976236.000019", "subtype": "file_comment", "is_intro": false, "file": {"image_exif_rotation": 1, "filetype": "png", "channels": ["C407ABS94"], "display_as_bot": false, "id": "F3ZJQTA66", "size": 68, "original_h": 1, "thumb_360_w": 1, "title": "1x1.png", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png", "thumb_360": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png", "thumb_64": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png", "ims": [], "thumb_80": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png", "thumb_360_h": 1, "external_type": "", "username": "", "timestamp": 1485975955, "public_url_shared": false, "editable": false, "thumb_160": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png", "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png", "user": "U407ABLLW", "groups": [], "is_public": true, "pretty_type": "PNG", "is_external": false, "mimetype": "image/png", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2", "permalink": "https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png", "name": "1x1.png", "created": 1485975955, "original_w": 1, "comments_count": 1, "mode": "hosted"}, "type": "message"}, "channel": "C407ABS94", "previous_message": {"comment": {"comment": "first comment! now i edited it.", "created": 1485976236, "timestamp": 1485976236, "is_intro": false, "user": "U407ABLLW", "id": "Fc3ZMDRQLV", "channel": ""}, "text": "<@U407ABLLW|alice> commented on <@U407ABLLW|alice>\u2019s file <https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png|1x1.png>: first comment! now i edited it.", "ts": "1485976236.000019", "subtype": "file_comment", "is_intro": false, "file": {"image_exif_rotation": 1, "filetype": "png", "channels": ["C407ABS94"], "display_as_bot": false, "id": "F3ZJQTA66", "size": 68, "original_h": 1, "thumb_360_w": 1, "title": "1x1.png", "url_private": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/1x1.png", "thumb_360": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_360.png", "thumb_64": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_64.png", "ims": [], "thumb_80": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_80.png", "thumb_360_h": 1, "external_type": "", "username": "", "timestamp": 1485975955, "public_url_shared": false, "editable": false, "thumb_160": "https://files.slack.com/files-tmb/T3YS5EAL9-F3ZJQTA66-8ab528dd77/1x1_160.png", "url_private_download": "https://files.slack.com/files-pri/T3YS5EAL9-F3ZJQTA66/download/1x1.png", "user": "U407ABLLW", "groups": [], "is_public": true, "pretty_type": "PNG", "is_external": false, "mimetype": "image/png", "permalink_public": "https://slack-files.com/T3YS5EAL9-F3ZJQTA66-5d747593d2", "permalink": "https://weeslacktest.slack.com/files/alice/F3ZJQTA66/1x1.png", "name": "1x1.png", "created": 1485975955, "original_w": 1, "comments_count": 1, "mode": "hosted"}, "type": "message"}}
diff --git a/_pytest/data/websocket/1485976248.65-file_comment_edited.json b/_pytest/data/websocket/1485976248.65-file_comment_edited.json
index f944ede..3e7c528 100644
--- a/_pytest/data/websocket/1485976248.65-file_comment_edited.json
+++ b/_pytest/data/websocket/1485976248.65-file_comment_edited.json
@@ -1 +1 @@
-{u'comment': {u'comment': u'first comment! now i edited it.', u'created': 1485976236, u'timestamp': 1485976236, u'is_intro': False, u'user': u'U407ABLLW', u'id': u'Fc3ZMDRQLV', u'channel': u''}, u'user_id': u'U407ABLLW', u'event_ts': u'1485976248.893801', u'file_id': u'F3ZJQTA66', u'file': {u'id': u'F3ZJQTA66'}, 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'file_comment_edited'} \ No newline at end of file
+{"comment": {"comment": "first comment! now i edited it.", "created": 1485976236, "timestamp": 1485976236, "is_intro": false, "user": "U407ABLLW", "id": "Fc3ZMDRQLV", "channel": ""}, "user_id": "U407ABLLW", "event_ts": "1485976248.893801", "file_id": "F3ZJQTA66", "file": {"id": "F3ZJQTA66"}, "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "file_comment_edited"}
diff --git a/_pytest/data/websocket/1485976267.81-reconnect_url.json b/_pytest/data/websocket/1485976267.81-reconnect_url.json
index c373cbc..55533ab 100644
--- a/_pytest/data/websocket/1485976267.81-reconnect_url.json
+++ b/_pytest/data/websocket/1485976267.81-reconnect_url.json
@@ -1 +1 @@
-{u'url': u'wss://mpmulti-m00z.slack-msgs.com/websocket/fZI1FV2ZuMYXeQLMKi1SrH2j69xL6m_6hC38CVCr0ugPFpMS1IBxlCvHJYbSrH-fMhSuLmbkEd1te_ND5Q-EyVVX-w06mn5NLZM9GaX_mWb9A3w79sThYzEgnnQ8onoeFM2CWgFNxWM_3XS4HJaWXeee-_sNh_booNbby8jm9mg=', 'wee_slack_metadata': {'team': 'd80c2b6c3127dbb1991917394ed219e8212a2606'}, u'type': u'reconnect_url'} \ No newline at end of file
+{"url": "wss://mpmulti-m00z.slack-msgs.com/websocket/fZI1FV2ZuMYXeQLMKi1SrH2j69xL6m_6hC38CVCr0ugPFpMS1IBxlCvHJYbSrH-fMhSuLmbkEd1te_ND5Q-EyVVX-w06mn5NLZM9GaX_mWb9A3w79sThYzEgnnQ8onoeFM2CWgFNxWM_3XS4HJaWXeee-_sNh_booNbby8jm9mg=", "wee_slack_metadata": {"team": "d80c2b6c3127dbb1991917394ed219e8212a2606"}, "type": "reconnect_url"}