diff --git a/matrix_sdk_test/src/lib.rs b/matrix_sdk_test/src/lib.rs
index 0adbcb73..0b84be4b 100644
--- a/matrix_sdk_test/src/lib.rs
+++ b/matrix_sdk_test/src/lib.rs
@@ -71,7 +71,7 @@ impl EventBuilder {
         variant: fn(Ev) -> Event,
     ) -> Self {
         let val: &str = match file {
-            EventsFile::Typing => include_str!("../test_data/events/typing.json"),
+            EventsFile::Typing => include_str!("../../test_data/events/typing.json"),
             _ => panic!("unknown ephemeral event file {:?}", file),
         };
 
@@ -109,8 +109,8 @@ impl EventBuilder {
         variant: fn(Ev) -> RoomEvent,
     ) -> Self {
         let val = match file {
-            EventsFile::Member => include_str!("../test_data/events/member.json"),
-            EventsFile::PowerLevels => include_str!("../test_data/events/power_levels.json"),
+            EventsFile::Member => include_str!("../../test_data/events/member.json"),
+            EventsFile::PowerLevels => include_str!("../../test_data/events/power_levels.json"),
             _ => panic!("unknown room event file {:?}", file),
         };
 
@@ -187,9 +187,9 @@ impl EventBuilder {
         variant: fn(Ev) -> StateEvent,
     ) -> Self {
         let val = match file {
-            EventsFile::Alias => include_str!("../test_data/events/alias.json"),
-            EventsFile::Aliases => include_str!("../test_data/events/aliases.json"),
-            EventsFile::Name => include_str!("../test_data/events/name.json"),
+            EventsFile::Alias => include_str!("../../test_data/events/alias.json"),
+            EventsFile::Aliases => include_str!("../../test_data/events/aliases.json"),
+            EventsFile::Name => include_str!("../../test_data/events/name.json"),
             _ => panic!("unknown state event file {:?}", file),
         };
 
@@ -204,7 +204,7 @@ impl EventBuilder {
     /// Add an presence event to the presence events `Vec`.
     pub fn add_presence_event(mut self, file: EventsFile) -> Self {
         let val = match file {
-            EventsFile::Presence => include_str!("../test_data/events/presence.json"),
+            EventsFile::Presence => include_str!("../../test_data/events/presence.json"),
             _ => panic!("unknown presence event file {:?}", file),
         };
 
@@ -339,13 +339,13 @@ pub enum SyncResponseFile {
 /// Get specific API responses for testing
 pub fn sync_response(kind: SyncResponseFile) -> SyncResponse {
     let data = match kind {
-        SyncResponseFile::All => include_bytes!("../test_data/more_sync.json").to_vec(),
-        SyncResponseFile::Default => include_bytes!("../test_data/sync.json").to_vec(),
+        SyncResponseFile::All => include_bytes!("../../test_data/more_sync.json").to_vec(),
+        SyncResponseFile::Default => include_bytes!("../../test_data/sync.json").to_vec(),
         SyncResponseFile::DefaultWithSummary => {
-            include_bytes!("../test_data/sync_with_summary.json").to_vec()
+            include_bytes!("../../test_data/sync_with_summary.json").to_vec()
         }
-        SyncResponseFile::Invite => include_bytes!("../test_data/invite_sync.json").to_vec(),
-        SyncResponseFile::Leave => include_bytes!("../test_data/leave_sync.json").to_vec(),
+        SyncResponseFile::Invite => include_bytes!("../../test_data/invite_sync.json").to_vec(),
+        SyncResponseFile::Leave => include_bytes!("../../test_data/leave_sync.json").to_vec(),
     };
 
     let response = Response::builder().body(data.to_vec()).unwrap();
diff --git a/matrix_sdk_test/test_data/context.json b/matrix_sdk_test/test_data/context.json
deleted file mode 100644
index be92b59b..00000000
--- a/matrix_sdk_test/test_data/context.json
+++ /dev/null
@@ -1,211 +0,0 @@
-{
-  "events_before": [],
-  "events_after": [
-    {
-      "content": {
-        "body": "yeah, let's do that",
-        "msgtype": "m.text"
-      },
-      "event_id": "$15163623196QOZxj:localhost",
-      "origin_server_ts": 1516362319505,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "type": "m.room.message",
-      "unsigned": {
-        "age": 43464955731
-      },
-      "user_id": "@example:localhost",
-      "age": 43464955731
-    }
-  ],
-  "start": "t182-189_0_0_0_0_0_0_0_0",
-  "end": "t184-190_0_0_0_0_0_0_0_0",
-  "event": {
-    "content": {
-      "body": "ok, let's handle invites, joins and parts",
-      "msgtype": "m.text"
-    },
-    "event_id": "$15163622445EBvZJ:localhost",
-    "origin_server_ts": 1516362244026,
-    "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-    "sender": "@example2:localhost",
-    "type": "m.room.message",
-    "unsigned": {
-      "age": 43465031210
-    },
-    "user_id": "@example2:localhost",
-    "age": 43465031210
-  },
-  "state": [
-    {
-      "content": {
-        "topic": "amazing work"
-      },
-      "event_id": "$151568196747dxLZM:localhost",
-      "origin_server_ts": 1515681967443,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "",
-      "type": "m.room.topic",
-      "unsigned": {
-        "replaces_state": "$151567214844LzHAk:localhost",
-        "age": 44145307793
-      },
-      "user_id": "@example:localhost",
-      "age": 44145307793,
-      "replaces_state": "$151567214844LzHAk:localhost"
-    },
-    {
-      "content": {
-        "aliases": [
-          "#tutorial:localhost"
-        ]
-      },
-      "event_id": "$15139375516NUgtD:localhost",
-      "origin_server_ts": 1513937551720,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "localhost",
-      "type": "m.room.aliases",
-      "unsigned": {
-        "age": 45889723516
-      },
-      "user_id": "@example:localhost",
-      "age": 45889723516
-    },
-    {
-      "content": {
-        "history_visibility": "shared"
-      },
-      "event_id": "$15139375515VaJEY:localhost",
-      "origin_server_ts": 1513937551613,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "",
-      "type": "m.room.history_visibility",
-      "unsigned": {
-        "age": 45889723623
-      },
-      "user_id": "@example:localhost",
-      "age": 45889723623
-    },
-    {
-      "content": {
-        "join_rule": "public"
-      },
-      "event_id": "$15139375514WsgmR:localhost",
-      "origin_server_ts": 1513937551539,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "",
-      "type": "m.room.join_rules",
-      "unsigned": {
-        "age": 45889723697
-      },
-      "user_id": "@example:localhost",
-      "age": 45889723697
-    },
-    {
-      "content": {
-        "alias": "#tutorial:localhost"
-      },
-      "event_id": "$15139375513VdeRF:localhost",
-      "origin_server_ts": 1513937551461,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "",
-      "type": "m.room.canonical_alias",
-      "unsigned": {
-        "age": 45889723775
-      },
-      "user_id": "@example:localhost",
-      "age": 45889723775
-    },
-    {
-      "content": {
-        "ban": 50,
-        "events": {
-          "m.room.avatar": 50,
-          "m.room.canonical_alias": 50,
-          "m.room.history_visibility": 100,
-          "m.room.name": 50,
-          "m.room.power_levels": 100
-        },
-        "events_default": 0,
-        "invite": 0,
-        "kick": 50,
-        "redact": 50,
-        "state_default": 50,
-        "users": {
-          "@example:localhost": 100
-        },
-        "users_default": 0
-      },
-      "event_id": "$15139375512JaHAW:localhost",
-      "origin_server_ts": 1513937551359,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "",
-      "type": "m.room.power_levels",
-      "unsigned": {
-        "age": 45889723877
-      },
-      "user_id": "@example:localhost",
-      "age": 45889723877
-    },
-    {
-      "content": {
-        "creator": "@example:localhost"
-      },
-      "event_id": "$15139375510KUZHi:localhost",
-      "origin_server_ts": 1513937551203,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "",
-      "type": "m.room.create",
-      "unsigned": {
-        "age": 45889724033
-      },
-      "user_id": "@example:localhost",
-      "age": 45889724033
-    },
-    {
-      "content": {
-        "avatar_url": null,
-        "displayname": "example2",
-        "membership": "join"
-      },
-      "event_id": "$151396611913abyeC:localhost",
-      "membership": "join",
-      "origin_server_ts": 1513966119908,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example2:localhost",
-      "state_key": "@example2:localhost",
-      "type": "m.room.member",
-      "unsigned": {
-        "age": 45861155328
-      },
-      "user_id": "@example2:localhost",
-      "age": 45861155328
-    },
-    {
-      "content": {
-        "avatar_url": null,
-        "displayname": "example",
-        "membership": "join"
-      },
-      "event_id": "$15139375511GBYDY:localhost",
-      "membership": "join",
-      "origin_server_ts": 1513937551274,
-      "room_id": "!SVkFJHzfwvuaIEawgC:localhost",
-      "sender": "@example:localhost",
-      "state_key": "@example:localhost",
-      "type": "m.room.member",
-      "unsigned": {
-        "age": 45889723962
-      },
-      "user_id": "@example:localhost",
-      "age": 45889723962
-    }
-  ]
-}
diff --git a/matrix_sdk_test/test_data/delete_devices.json b/matrix_sdk_test/test_data/delete_devices.json
deleted file mode 100644
index aa4c1330..00000000
--- a/matrix_sdk_test/test_data/delete_devices.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "completed": [
-    "example.type.foo"
-  ],
-  "flows": [
-    {
-      "stages": [
-        "example.type.foo"
-      ]
-    }
-  ],
-  "params": {
-    "example.type.baz": {
-      "example_key": "foobar"
-    }
-  },
-  "session": "xxxxxxyz"
-}
diff --git a/matrix_sdk_test/test_data/devices.json b/matrix_sdk_test/test_data/devices.json
deleted file mode 100644
index a3af5a3d..00000000
--- a/matrix_sdk_test/test_data/devices.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "devices": [
-      {
-        "device_id": "QBUAZIFURK",
-        "display_name": "android",
-        "last_seen_ip": "1.2.3.4",
-        "last_seen_ts": 1474491775024
-      }
-    ]
-}
diff --git a/matrix_sdk_test/test_data/event_id.json b/matrix_sdk_test/test_data/event_id.json
deleted file mode 100644
index bf423646..00000000
--- a/matrix_sdk_test/test_data/event_id.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "event_id": "$h29iv0s8:example.com"
-}
diff --git a/matrix_sdk_test/test_data/events/alias.json b/matrix_sdk_test/test_data/events/alias.json
deleted file mode 100644
index 48196492..00000000
--- a/matrix_sdk_test/test_data/events/alias.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "content": {
-        "alias": "#tutorial:localhost"
-    },
-    "event_id": "$15139375513VdeRF:localhost",
-    "origin_server_ts": 1513937551461,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.canonical_alias",
-    "unsigned": {
-        "age": 7034220433
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/aliases.json b/matrix_sdk_test/test_data/events/aliases.json
deleted file mode 100644
index 5b81aa2d..00000000
--- a/matrix_sdk_test/test_data/events/aliases.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "content": {
-        "aliases": [
-            "#tutorial:localhost"
-        ]
-    },
-    "event_id": "$15139375516NUgtD:localhost",
-    "origin_server_ts": 1513937551720,
-    "sender": "@example:localhost",
-    "state_key": "localhost",
-    "type": "m.room.aliases",
-    "unsigned": {
-        "age": 7034220174
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/create.json b/matrix_sdk_test/test_data/events/create.json
deleted file mode 100644
index 8b3a5926..00000000
--- a/matrix_sdk_test/test_data/events/create.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "content": {
-        "creator": "@example:localhost",
-        "m.federate": true,
-        "room_version": "1"
-    },
-    "event_id": "$151957878228ekrDs:localhost",
-    "origin_server_ts": 1519578782185,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.create",
-    "unsigned": {
-      "age": 1392989709
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/fully_read.json b/matrix_sdk_test/test_data/events/fully_read.json
deleted file mode 100644
index c736e515..00000000
--- a/matrix_sdk_test/test_data/events/fully_read.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "content": {
-        "event_id": "$someplace:example.org"
-    },
-    "room_id": "!somewhere:example.org",
-    "type": "m.fully_read"
-}
diff --git a/matrix_sdk_test/test_data/events/history_visibility.json b/matrix_sdk_test/test_data/events/history_visibility.json
deleted file mode 100644
index fae3be3b..00000000
--- a/matrix_sdk_test/test_data/events/history_visibility.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "content": {
-        "history_visibility": "world_readable"
-    },
-    "event_id": "$151957878235ricnD:localhost",
-    "origin_server_ts": 1519578782195,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.history_visibility",
-    "unsigned": {
-      "age": 1392989715
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/join_rules.json b/matrix_sdk_test/test_data/events/join_rules.json
deleted file mode 100644
index 7c116ae6..00000000
--- a/matrix_sdk_test/test_data/events/join_rules.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "content": {
-        "join_rule": "public"
-    },
-    "event_id": "$151957878231iejdB:localhost",
-    "origin_server_ts": 1519578782192,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.join_rules",
-    "unsigned": {
-      "age": 1392989713
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/member.json b/matrix_sdk_test/test_data/events/member.json
deleted file mode 100644
index 10424dcb..00000000
--- a/matrix_sdk_test/test_data/events/member.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "content": {
-        "avatar_url": null,
-        "displayname": "example",
-        "membership": "join"
-    },
-    "event_id": "$151800140517rfvjc:localhost",
-    "membership": "join",
-    "origin_server_ts": 1518001405556,
-    "sender": "@example:localhost",
-    "state_key": "@example:localhost",
-    "type": "m.room.member",
-    "unsigned": {
-        "age": 2970366338,
-        "replaces_state": "$151800111315tsynI:localhost",
-        "prev_content": {
-            "avatar_url": null,
-            "displayname": "example",
-            "membership": "invite"
-        }
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/message_emote.json b/matrix_sdk_test/test_data/events/message_emote.json
deleted file mode 100644
index 146ce548..00000000
--- a/matrix_sdk_test/test_data/events/message_emote.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "is dancing", "format": "org.matrix.custom.html",
-        "formatted_body": "<strong>is dancing</strong>",
-        "msgtype": "m.emote"
-    },
-    "event_id": "$152037280074GZeOm:localhost",
-    "origin_server_ts": 1520372800469,
-    "sender": "@example:localhost",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 598971425
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/message_notice.json b/matrix_sdk_test/test_data/events/message_notice.json
deleted file mode 100644
index 6215c904..00000000
--- a/matrix_sdk_test/test_data/events/message_notice.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "origin_server_ts": 1533565163841,
-  "sender": "@_neb_github:matrix.org",
-  "event_id": "$153356516319138IHRIC:matrix.org",
-  "unsigned": {
-    "age": 743
-  },
-  "content": {
-    "body": "https://github.com/matrix-org/matrix-python-sdk/issues/266 : Consider allowing MatrixClient.__init__ to take sync_token kwarg",
-    "format": "org.matrix.custom.html",
-    "formatted_body": "<a href='https://github.com/matrix-org/matrix-python-sdk/pull/313'>313: nio wins!</a>",
-    "msgtype": "m.notice"
-  },
-  "type": "m.room.message",
-  "room_id": "!YHhmBTmGBHGQOlGpaZ:matrix.org"
-}
diff --git a/matrix_sdk_test/test_data/events/message_text.json b/matrix_sdk_test/test_data/events/message_text.json
deleted file mode 100644
index b95607cd..00000000
--- a/matrix_sdk_test/test_data/events/message_text.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "content": {
-        "body": "is dancing", "format": "org.matrix.custom.html",
-        "formatted_body": "<strong>is dancing</strong>",
-        "msgtype": "m.text"
-    },
-    "event_id": "$152037280074GZeOm:localhost",
-    "origin_server_ts": 1520372800469,
-    "sender": "@example:localhost",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 598971425
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/name.json b/matrix_sdk_test/test_data/events/name.json
deleted file mode 100644
index fa70a945..00000000
--- a/matrix_sdk_test/test_data/events/name.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "content": {
-        "name": "room name"
-    },
-    "event_id": "$15139375513VdeRF:localhost",
-    "origin_server_ts": 1513937551461,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.name",
-    "unsigned": {
-        "age": 7034220433
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/power_levels.json b/matrix_sdk_test/test_data/events/power_levels.json
deleted file mode 100644
index 427b0b57..00000000
--- a/matrix_sdk_test/test_data/events/power_levels.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "content": {
-        "ban": 50,
-        "events": {
-            "m.room.avatar": 50,
-            "m.room.canonical_alias": 50,
-            "m.room.history_visibility": 100,
-            "m.room.name": 50,
-            "m.room.power_levels": 100,
-            "m.room.message": 25
-        },
-        "events_default": 0,
-        "invite": 0,
-        "kick": 50,
-        "redact": 50,
-        "state_default": 50,
-        "users": {
-            "@example:localhost": 100,
-            "@bob:localhost": 0
-        },
-        "users_default": 0
-    },
-    "event_id": "$15139375512JaHAW:localhost",
-    "origin_server_ts": 1513937551359,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.power_levels",
-    "unsigned": {
-        "age": 7034220535
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/presence.json b/matrix_sdk_test/test_data/events/presence.json
deleted file mode 100644
index 0c740980..00000000
--- a/matrix_sdk_test/test_data/events/presence.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "content": {
-        "avatar_url": "mxc://localhost:wefuiwegh8742w",
-        "currently_active": false,
-        "last_active_ago": 1,
-        "presence": "online",
-        "status_msg": "Making cupcakes"
-    },
-    "sender": "@example:localhost",
-    "type": "m.presence"
-}
diff --git a/matrix_sdk_test/test_data/events/redacted.json b/matrix_sdk_test/test_data/events/redacted.json
deleted file mode 100644
index ae1a3ce3..00000000
--- a/matrix_sdk_test/test_data/events/redacted.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "content": {},
-    "event_id": "$15275046980maRLj:localhost",
-    "origin_server_ts": 1527504698685,
-    "sender": "@example:localhost",
-    "type": "m.room.message",
-    "unsigned": {
-        "age": 19334,
-        "redacted_because": {
-            "content": {},
-            "event_id": "$15275047031IXQRi:localhost",
-            "origin_server_ts": 1527504703496,
-            "redacts": "$15275046980maRLj:localhost",
-            "sender": "@example:localhost",
-            "type": "m.room.redaction",
-            "unsigned": {
-                "age": 14523
-            }
-        },
-        "redacted_by": "$15275047031IXQRi:localhost"
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/redacted_invalid.json b/matrix_sdk_test/test_data/events/redacted_invalid.json
deleted file mode 100644
index 47fb283b..00000000
--- a/matrix_sdk_test/test_data/events/redacted_invalid.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "content": {},
-    "event_id": "$15275046980maRLj:localhost",
-    "origin_server_ts": 1527504698685,
-    "sender": "@example:localhost",
-    "type": "m.room.message"
-}
diff --git a/matrix_sdk_test/test_data/events/redacted_state.json b/matrix_sdk_test/test_data/events/redacted_state.json
deleted file mode 100644
index 3968ec14..00000000
--- a/matrix_sdk_test/test_data/events/redacted_state.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "content": {},
-    "event_id": "$example_id:example.org",
-    "origin_server_ts": 1532324933640,
-    "sender": "@example:example.org",
-    "state_key": "test_state_key",
-    "type": "m.some.state",
-    "unsigned": {
-        "age": 30693154231,
-        "redacted_because": {
-            "content": {},
-            "event_id": "$redaction_example_id:example.org",
-            "origin_server_ts": 1532324940702,
-            "redacts": "$example_id:example.org",
-            "sender": "@example:example:org",
-            "type": "m.room.redaction",
-            "unsigned": {"age": 30693147169}
-        },
-        "redacted_by": "$redaction_example_id:example.org"
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/redaction.json b/matrix_sdk_test/test_data/events/redaction.json
deleted file mode 100644
index 5047d2f3..00000000
--- a/matrix_sdk_test/test_data/events/redaction.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "content": {
-        "reason": "😀"
-    },
-    "event_id": "$151957878228ssqrJ:localhost",
-    "origin_server_ts": 1519578782185,
-    "sender": "@example:localhost",
-    "type": "m.room.redaction",
-    "redacts": "$151957878228ssqrj:localhost"
-}
diff --git a/matrix_sdk_test/test_data/events/room_avatar.json b/matrix_sdk_test/test_data/events/room_avatar.json
deleted file mode 100644
index 92ed2519..00000000
--- a/matrix_sdk_test/test_data/events/room_avatar.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "content": {
-        "info": {
-            "h": 398,
-            "mimetype": "image/jpeg",
-            "size": 31037,
-            "w": 394
-        },
-        "url": "mxc://domain.com/JWEIFJgwEIhweiWJE"
-    },
-    "event_id": "$143273582443PhrSn:domain.com",
-    "origin_server_ts": 1432735824653,
-    "room_id": "!jEsUZKDJdhlrceRyVU:domain.com",
-    "sender": "@example:domain.com",
-    "state_key": "",
-    "type": "m.room.avatar",
-    "unsigned": {
-        "age": 1234
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/tag.json b/matrix_sdk_test/test_data/events/tag.json
deleted file mode 100644
index b42b06db..00000000
--- a/matrix_sdk_test/test_data/events/tag.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "content": {
-        "tags": {
-            "u.work": {
-                "order": 0.9
-            }
-        }
-    },
-    "type": "m.tag"
-}
diff --git a/matrix_sdk_test/test_data/events/topic.json b/matrix_sdk_test/test_data/events/topic.json
deleted file mode 100644
index 930ff0a3..00000000
--- a/matrix_sdk_test/test_data/events/topic.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "content": {
-        "topic": "😀"
-    },
-    "event_id": "$151957878228ssqrJ:localhost",
-    "origin_server_ts": 1519578782185,
-    "sender": "@example:localhost",
-    "state_key": "",
-    "type": "m.room.topic",
-    "unsigned": {
-      "age": 1392989709,
-      "prev_content": {
-        "topic": "test"
-      },
-      "prev_sender": "@example:localhost",
-      "replaces_state": "$151957069225EVYKm:localhost"
-    }
-}
diff --git a/matrix_sdk_test/test_data/events/typing.json b/matrix_sdk_test/test_data/events/typing.json
deleted file mode 100644
index 52949f76..00000000
--- a/matrix_sdk_test/test_data/events/typing.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "content": {
-        "user_ids": [
-            "@alice:matrix.org",
-            "@bob:example.com"
-        ]
-    },
-    "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-    "type": "m.typing"
-}
diff --git a/matrix_sdk_test/test_data/get_avatar_response.json b/matrix_sdk_test/test_data/get_avatar_response.json
deleted file mode 100644
index 9227a544..00000000
--- a/matrix_sdk_test/test_data/get_avatar_response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "avatar_url": "mxc://matrix.org/SDGdghriugerRg"
-}
diff --git a/matrix_sdk_test/test_data/get_displayname_response.json b/matrix_sdk_test/test_data/get_displayname_response.json
deleted file mode 100644
index fed57979..00000000
--- a/matrix_sdk_test/test_data/get_displayname_response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "displayname": "Bob"
-}
diff --git a/matrix_sdk_test/test_data/get_profile_response.json b/matrix_sdk_test/test_data/get_profile_response.json
deleted file mode 100644
index 4abbd6fb..00000000
--- a/matrix_sdk_test/test_data/get_profile_response.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "displayname": "Bob",
-    "avatar_url": "mxc://matrix.org/SDGdghriugerRg",
-    "something_else": 123
-}
diff --git a/matrix_sdk_test/test_data/invite_sync.json b/matrix_sdk_test/test_data/invite_sync.json
deleted file mode 100644
index 42852a2e..00000000
--- a/matrix_sdk_test/test_data/invite_sync.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "device_one_time_keys_count": {},
-    "next_batch": "s526_47314_0_7_1_1_1_11444_1",
-    "device_lists": {
-        "changed": [
-            "@example:example.org"
-        ],
-        "left": []
-    },
-    "rooms": {
-        "invite": {
-            "!696r7674:example.com": {
-              "invite_state": {
-                "events": [
-                  {
-                    "sender": "@alice:example.com",
-                    "type": "m.room.name",
-                    "state_key": "",
-                    "content": {
-                      "name": "My Room Name"
-                    }
-                  },
-                  {
-                    "sender": "@alice:example.com",
-                    "type": "m.room.member",
-                    "state_key": "@bob:example.com",
-                    "content": {
-                      "membership": "invite"
-                    }
-                  }
-                ]
-              }
-            }
-          },
-        "join": {},
-        "leave": {}
-    },
-    "to_device": {
-        "events": []
-    },
-    "presence": {
-        "events": [
-            {
-                "content": {
-                    "avatar_url": "mxc://localhost:wefuiwegh8742w",
-                    "currently_active": false,
-                    "last_active_ago": 1,
-                    "presence": "online",
-                    "status_msg": "Making cupcakes"
-                },
-                "sender": "@example:localhost",
-                "type": "m.presence"
-            }
-        ]
-    }
-}
diff --git a/matrix_sdk_test/test_data/joined_members_response.json b/matrix_sdk_test/test_data/joined_members_response.json
deleted file mode 100644
index c2458a29..00000000
--- a/matrix_sdk_test/test_data/joined_members_response.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "joined": {
-      "@bar:example.com": {
-        "avatar_url": null,
-        "display_name": "Bar"
-      }
-    }
-}
diff --git a/matrix_sdk_test/test_data/keys_claim.json b/matrix_sdk_test/test_data/keys_claim.json
deleted file mode 100644
index 1712d52e..00000000
--- a/matrix_sdk_test/test_data/keys_claim.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "failures": {},
-  "one_time_keys": {
-    "@alice:example.com": {
-      "JLAFKJWSCS": {
-        "signed_curve25519:AAAAHg": {
-          "key": "zKbLg+NrIjpnagy+pIY6uPL4ZwEG2v+8F9lmgsnlZzs",
-          "signatures": {
-            "@alice:example.com": {
-              "ed25519:JLAFKJWSCS": "FLWxXqGbwrb8SM3Y795eB6OA8bwBcoMZFXBqnTn58AYWZSqiD45tlBVcDa2L7RwdKXebW/VzDlnfVJ+9jok1Bw"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/matrix_sdk_test/test_data/keys_query.json b/matrix_sdk_test/test_data/keys_query.json
deleted file mode 100644
index 66b112df..00000000
--- a/matrix_sdk_test/test_data/keys_query.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "device_keys": {
-    "@alice:example.org": {
-      "JLAFKJWSCS": {
-          "algorithms": [
-              "m.olm.v1.curve25519-aes-sha2",
-              "m.megolm.v1.aes-sha2"
-          ],
-          "device_id": "JLAFKJWSCS",
-          "user_id": "@alice:example.org",
-          "keys": {
-              "curve25519:JLAFKJWSCS": "wjLpTLRqbqBzLs63aYaEv2Boi6cFEbbM/sSRQ2oAKk4",
-              "ed25519:JLAFKJWSCS": "nE6W2fCblxDcOFmeEtCHNl8/l8bXcu7GKyAswA4r3mM"
-          },
-          "signatures": {
-              "@alice:example.org": {
-                  "ed25519:JLAFKJWSCS": "m53Wkbh2HXkc3vFApZvCrfXcX3AI51GsDHustMhKwlv3TuOJMj4wistcOTM8q2+e/Ro7rWFUb9ZfnNbwptSUBA"
-              }
-          },
-          "unsigned": {
-              "device_display_name": "Alice's mobile phone"
-          }
-      }
-    }
-  },
-  "failures": {}
-}
diff --git a/matrix_sdk_test/test_data/keys_upload.json b/matrix_sdk_test/test_data/keys_upload.json
deleted file mode 100644
index e32a62c4..00000000
--- a/matrix_sdk_test/test_data/keys_upload.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "one_time_key_counts": {
-    "curve25519": 10,
-    "signed_curve25519": 20
-  }
-}
diff --git a/matrix_sdk_test/test_data/leave_event_sync.json b/matrix_sdk_test/test_data/leave_event_sync.json
deleted file mode 100644
index bd6c7d23..00000000
--- a/matrix_sdk_test/test_data/leave_event_sync.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-    "account_data": {
-        "events": []
-    },
-    "to_device": {
-        "events": []
-    },
-    "device_lists": {
-        "changed": [],
-        "left": []
-    },
-    "presence": {
-        "events": []
-    },
-    "rooms": {
-        "join": {},
-        "invite": {},
-        "leave": {
-            "!SVkFJHzfwvuaIEawgC:localhost": {
-                "timeline": {
-                    "events": [
-                        {
-                            "content": {
-                                "membership": "leave"
-                            },
-                            "origin_server_ts": 1589578095276,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "replaces_state": "$blahblah",
-                                "prev_content": {
-                                    "avatar_url": null,
-                                    "displayname": "me",
-                                    "membership": "invite"
-                                },
-                                "prev_sender": "@2example:localhost",
-                                "age": 1757
-                            },
-                            "event_id": "$lQQ116Y-XqcjpSUGpuz36rNntUvOSpTjuaIvmtQ2AwA"
-                        }
-                    ],
-                    "prev_batch": "tokenTOKEN",
-                    "limited": false
-                },
-                "state": {
-                    "events": []
-                },
-                "account_data": {
-                    "events": []
-                }
-            }
-        }
-    },
-    "groups": {
-        "join": {},
-        "invite": {},
-        "leave": {}
-    },
-    "device_one_time_keys_count": {
-        "signed_curve25519": 50
-    },
-    "next_batch": "s1380317562_757269739_1655566_503953763_334052043_1209862_55290918_65705002_101146"
-}
diff --git a/matrix_sdk_test/test_data/leave_sync.json b/matrix_sdk_test/test_data/leave_sync.json
deleted file mode 100644
index bcac1680..00000000
--- a/matrix_sdk_test/test_data/leave_sync.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
-    "device_one_time_keys_count": {},
-    "next_batch": "s526_47314_0_7_1_1_1_11444_1",
-    "device_lists": {
-        "changed": [
-            "@example:example.org"
-        ],
-        "left": []
-    },
-    "rooms": {
-        "invite": {},
-        "join": {},
-        "leave": {
-            "!SVkFJHzfwvuaIEawgC:localhost": {
-                "summary": {},
-                "account_data": {
-                    "events": [
-                        {
-                            "content": {
-                                "event_id": "$someplace:example.org"
-                            },
-                            "room_id": "!roomid:room.com",
-                            "type": "m.fully_read"
-                        },
-                        {
-                            "content": {
-                                "ignored_users": {
-                                    "@someone:example.org": {}
-                                }
-                            },
-                            "type": "m.ignored_user_list"
-                        }
-                    ]
-                },
-                "ephemeral": {
-                    "events": [
-                        {
-                            "content": {
-                                "$151680659217152dPKjd:localhost": {
-                                    "m.read": {
-                                        "@example:localhost": {
-                                            "ts": 1516809890615
-                                        }
-                                    }
-                                }
-                            },
-                            "type": "m.receipt"
-                        }
-                    ]
-                },
-                "state": {
-                    "events": [
-                        {
-                            "content": {
-                                "join_rule": "public"
-                            },
-                            "event_id": "$15139375514WsgmR:localhost",
-                            "origin_server_ts": 1513937551539,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.join_rules",
-                            "unsigned": {
-                                "age": 7034220355
-                            }
-                        },
-                        {
-                            "content": {
-                                "avatar_url": null,
-                                "displayname": "example",
-                                "membership": "join"
-                            },
-                            "event_id": "$151800140517rfvjc:localhost",
-                            "membership": "join",
-                            "origin_server_ts": 1518001405556,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "age": 2970366338,
-                                "replaces_state": "$151800111315tsynI:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "history_visibility": "shared"
-                            },
-                            "event_id": "$15139375515VaJEY:localhost",
-                            "origin_server_ts": 1513937551613,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.history_visibility",
-                            "unsigned": {
-                                "age": 7034220281
-                            }
-                        },
-                        {
-                            "content": {
-                                "creator": "@example:localhost"
-                            },
-                            "event_id": "$15139375510KUZHi:localhost",
-                            "origin_server_ts": 1513937551203,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.create",
-                            "unsigned": {
-                                "age": 7034220691
-                            }
-                        },
-                        {
-                            "content": {
-                                "aliases": [
-                                    "#tutorial:localhost"
-                                ]
-                            },
-                            "event_id": "$15139375516NUgtD:localhost",
-                            "origin_server_ts": 1513937551720,
-                            "sender": "@example:localhost",
-                            "state_key": "localhost",
-                            "type": "m.room.aliases",
-                            "unsigned": {
-                                "age": 7034220174
-                            }
-                        },
-                        {
-                            "content": {
-                                "topic": "\ud83d\ude00"
-                            },
-                            "event_id": "$151957878228ssqrJ:localhost",
-                            "origin_server_ts": 1519578782185,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.topic",
-                            "unsigned": {
-                                "age": 1392989709,
-                                "prev_content": {
-                                    "topic": "test"
-                                },
-                                "prev_sender": "@example:localhost",
-                                "replaces_state": "$151957069225EVYKm:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "ban": 50,
-                                "events": {
-                                    "m.room.avatar": 50,
-                                    "m.room.canonical_alias": 50,
-                                    "m.room.history_visibility": 100,
-                                    "m.room.name": 50,
-                                    "m.room.power_levels": 100
-                                },
-                                "events_default": 0,
-                                "invite": 0,
-                                "kick": 50,
-                                "redact": 50,
-                                "state_default": 50,
-                                "users": {
-                                    "@example:localhost": 100
-                                },
-                                "users_default": 0
-                            },
-                            "event_id": "$15139375512JaHAW:localhost",
-                            "origin_server_ts": 1513937551359,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.power_levels",
-                            "unsigned": {
-                                "age": 7034220535
-                            }
-                        },
-                        {
-                            "content": {
-                                "alias": "#tutorial:localhost"
-                            },
-                            "event_id": "$15139375513VdeRF:localhost",
-                            "origin_server_ts": 1513937551461,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.canonical_alias",
-                            "unsigned": {
-                                "age": 7034220433
-                            }
-                        },
-                        {
-                            "content": {
-                                "avatar_url": null,
-                                "displayname": "example2",
-                                "membership": "join"
-                            },
-                            "event_id": "$152034824468gOeNB:localhost",
-                            "membership": "join",
-                            "origin_server_ts": 1520348244605,
-                            "sender": "@example2:localhost",
-                            "state_key": "@example2:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "age": 623527289,
-                                "prev_content": {
-                                    "membership": "leave"
-                                },
-                                "prev_sender": "@example:localhost",
-                                "replaces_state": "$152034819067QWJxM:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                              "membership": "leave",
-                              "reason": "offline",
-                              "avatar_url": "avatar.com",
-                              "displayname": "example"
-                            },
-                            "event_id": "$1585345508297748AIUBh:matrix.org",
-                            "origin_server_ts": 1585345508223,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                              "replaces_state": "$1585345354296486IGZfp:localhost",
-                              "prev_content": {
-                                "avatar_url": "avatar.com",
-                                "displayname": "example",
-                                "membership": "join"
-                              },
-                              "prev_sender": "@example2:localhost",
-                              "age": 6992
-                            },
-                            "room_id": "!roomid:room.com"
-                          }
-                    ]
-                },
-                "timeline": {
-                    "events": [
-                        {
-                            "content": {
-                                "body": "baba",
-                                "format": "org.matrix.custom.html",
-                                "formatted_body": "<strong>baba</strong>",
-                                "msgtype": "m.text"
-                            },
-                            "event_id": "$152037280074GZeOm:localhost",
-                            "origin_server_ts": 1520372800469,
-                            "sender": "@example:localhost",
-                            "type": "m.room.message",
-                            "unsigned": {
-                                "age": 598971425
-                            }
-                        }
-                    ],
-                    "limited": true,
-                    "prev_batch": "t392-516_47314_0_7_1_1_1_11444_1"
-                },
-                "unread_notifications": {
-                    "highlight_count": 0,
-                    "notification_count": 11
-                }
-            }
-        }
-    },
-    "to_device": {
-        "events": []
-    },
-    "presence": {
-        "events": [
-            {
-                "content": {
-                    "avatar_url": "mxc://localhost:wefuiwegh8742w",
-                    "currently_active": false,
-                    "last_active_ago": 1,
-                    "presence": "online",
-                    "status_msg": "Making cupcakes"
-                },
-                "sender": "@example:localhost",
-                "type": "m.presence"
-            }
-        ]
-    }
-}
diff --git a/matrix_sdk_test/test_data/limit_exceeded_error.json b/matrix_sdk_test/test_data/limit_exceeded_error.json
deleted file mode 100644
index 84b23a56..00000000
--- a/matrix_sdk_test/test_data/limit_exceeded_error.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "errcode": "M_LIMIT_EXCEEDED",
-  "error": "Too many requests",
-  "retry_after_ms": 500
-}
diff --git a/matrix_sdk_test/test_data/login_info.json b/matrix_sdk_test/test_data/login_info.json
deleted file mode 100644
index 968f4955..00000000
--- a/matrix_sdk_test/test_data/login_info.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "flows": [
-        {
-            "type": "m.login.sso",
-            "type": "m.login.password"
-        }
-    ]
-}
diff --git a/matrix_sdk_test/test_data/login_invalid_format.json b/matrix_sdk_test/test_data/login_invalid_format.json
deleted file mode 100644
index af084720..00000000
--- a/matrix_sdk_test/test_data/login_invalid_format.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "access_token": "abc123",
-    "device_id": "GHTYAJCE",
-    "home_server": "matrix.org",
-    "user_id": "cheeky_monkey"
-}
diff --git a/matrix_sdk_test/test_data/login_response.json b/matrix_sdk_test/test_data/login_response.json
deleted file mode 100644
index 6bff348a..00000000
--- a/matrix_sdk_test/test_data/login_response.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "access_token": "abc123",
-    "device_id": "GHTYAJCE",
-    "home_server": "matrix.org",
-    "user_id": "@cheeky_monkey:matrix.org"
-}
diff --git a/matrix_sdk_test/test_data/login_response_error.json b/matrix_sdk_test/test_data/login_response_error.json
deleted file mode 100644
index 9e573c1a..00000000
--- a/matrix_sdk_test/test_data/login_response_error.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "errcode": "M_FORBIDDEN",
-  "error": "Invalid password"
-}
diff --git a/matrix_sdk_test/test_data/logout_response.json b/matrix_sdk_test/test_data/logout_response.json
deleted file mode 100644
index 0967ef42..00000000
--- a/matrix_sdk_test/test_data/logout_response.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/matrix_sdk_test/test_data/more_sync.json b/matrix_sdk_test/test_data/more_sync.json
deleted file mode 100644
index f487281c..00000000
--- a/matrix_sdk_test/test_data/more_sync.json
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-    "device_one_time_keys_count": {},
-    "next_batch": "s526_47314_0_7_1_1_1_11444_1",
-    "device_lists": {
-        "changed": [
-            "@example:example.org"
-        ],
-        "left": []
-    },
-    "rooms": {
-        "invite": {},
-        "join": {
-            "!SVkFJHzfwvuaIEawgC:localhost": {
-                "summary": {},
-                "account_data": {
-                    "events": []
-                },
-                "ephemeral": {
-                    "events": [
-                        {
-                            "content": {
-                                "$151680659217152dPKjd:localhost": {
-                                    "m.read": {
-                                        "@example:localhost": {
-                                            "ts": 1516809890615
-                                        }
-                                    }
-                                }
-                            },
-                            "type": "m.receipt"
-                        },
-                        {
-                            "content": {
-                                "user_ids": [
-                                    "@alice:matrix.org",
-                                    "@bob:example.com"
-                                ]
-                            },
-                            "room_id": "!jEsUZKDJdhlrceRyVU:example.org",
-                            "type": "m.typing"
-                        }
-                    ]
-                },
-                "state": {
-                    "events": []
-                },
-                "timeline": {
-                    "events": [
-                        {
-                            "content": {
-                                "body": "baba",
-                                "format": "org.matrix.custom.html",
-                                "formatted_body": "<strong>baba</strong>",
-                                "msgtype": "m.text"
-                            },
-                            "event_id": "$152037280074GZeOm:localhost",
-                            "origin_server_ts": 1520372800469,
-                            "sender": "@example:localhost",
-                            "type": "m.room.message",
-                            "unsigned": {
-                                "age": 598971425
-                            }
-                        },
-                        {
-                            "content": {
-                                "body": " * edited message",
-                                "m.new_content": {
-                                    "body": "edited message",
-                                    "msgtype": "m.text"
-                                },
-                                "m.relates_to": {
-                                    "event_id": "some event id",
-                                    "rel_type": "m.replace"
-                                },
-                                "msgtype": "m.text"
-                            },
-                            "event_id": "edit event id",
-                            "origin_server_ts": 1590262659984,
-                            "sender": "@alice:matrix.org",
-                            "type": "m.room.message",
-                            "unsigned": {
-                                "age": 85
-                            }
-                        },
-                        {
-                            "content": {
-                                "reason": "😀"
-                            },
-                            "event_id": "$151957878228ssqrJ:localhost",
-                            "origin_server_ts": 1519578782185,
-                            "sender": "@example:localhost",
-                            "type": "m.room.redaction",
-                            "redacts": "$151957878228ssqrj:localhost"
-                        },
-                        {
-                            "content": {},
-                            "event_id": "$15275046980maRLj:localhost",
-                            "origin_server_ts": 1527504698685,
-                            "sender": "@example:localhost",
-                            "type": "m.room.message",
-                            "unsigned": {
-                                "age": 19334,
-                                "redacted_because": {
-                                    "content": {},
-                                    "event_id": "$15275047031IXQRi:localhost",
-                                    "origin_server_ts": 1527504703496,
-                                    "redacts": "$15275046980maRLj:localhost",
-                                    "sender": "@example:localhost",
-                                    "type": "m.room.redaction",
-                                    "unsigned": {
-                                        "age": 14523
-                                    }
-                                },
-                                "redacted_by": "$15275047031IXQRi:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "m.relates_to": {
-                                    "event_id": "some event id",
-                                    "key": "👍",
-                                    "rel_type": "m.annotation"
-                                }
-                            },
-                            "event_id": "event id",
-                            "origin_server_ts": 1590275813161,
-                            "sender": "@alice:matrix.org",
-                            "type": "m.reaction",
-                            "unsigned": {
-                                "age": 85
-                            }
-                        }
-                    ],
-                    "limited": true,
-                    "prev_batch": "t392-516_47314_0_7_1_1_1_11444_1"
-                },
-                "unread_notifications": {
-                    "highlight_count": 0,
-                    "notification_count": 11
-                }
-            }
-        },
-        "leave": {}
-    },
-    "to_device": {
-        "events": []
-    },
-    "presence": {
-        "events": []
-    }
-}
diff --git a/matrix_sdk_test/test_data/room_id.json b/matrix_sdk_test/test_data/room_id.json
deleted file mode 100644
index 75974b00..00000000
--- a/matrix_sdk_test/test_data/room_id.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "room_id": "!testroom:example.org"
-}
diff --git a/matrix_sdk_test/test_data/room_messages.json b/matrix_sdk_test/test_data/room_messages.json
deleted file mode 100644
index b394266e..00000000
--- a/matrix_sdk_test/test_data/room_messages.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "chunk": [
-      {
-        "age": 1042,
-        "content": {
-          "body": "hello world",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1444812213350496Caaaa:example.com",
-        "origin_server_ts": 1444812213737,
-        "room_id": "!Xq3620DUiqCaoxq:example.com",
-        "sender": "@alice:example.com",
-        "type": "m.room.message"
-      },
-      {
-        "age": 20123,
-        "content": {
-          "body": "the world is big",
-          "msgtype": "m.text"
-        },
-        "event_id": "$1444812213350496Cbbbb:example.com",
-        "origin_server_ts": 1444812194656,
-        "room_id": "!Xq3620DUiqCaoxq:example.com",
-        "sender": "@bob:example.com",
-        "type": "m.room.message"
-      },
-      {
-        "age": 50789,
-        "content": {
-          "name": "New room name"
-        },
-        "event_id": "$1444812213350496Ccccc:example.com",
-        "origin_server_ts": 1444812163990,
-        "prev_content": {
-          "name": "Old room name"
-        },
-        "room_id": "!Xq3620DUiqCaoxq:example.com",
-        "sender": "@bob:example.com",
-        "state_key": "",
-        "type": "m.room.name"
-      }
-    ],
-    "end": "t47409-4357353_219380_26003_2265",
-    "start": "t47429-4392820_219380_26003_2265"
-}
diff --git a/matrix_sdk_test/test_data/sync.json b/matrix_sdk_test/test_data/sync.json
deleted file mode 100644
index a6aaeaba..00000000
--- a/matrix_sdk_test/test_data/sync.json
+++ /dev/null
@@ -1,277 +0,0 @@
-{
-    "device_one_time_keys_count": {},
-    "next_batch": "s526_47314_0_7_1_1_1_11444_1",
-    "device_lists": {
-        "changed": [
-            "@example:example.org"
-        ],
-        "left": []
-    },
-    "rooms": {
-        "invite": {},
-        "join": {
-            "!SVkFJHzfwvuaIEawgC:localhost": {
-                "summary": {},
-                "account_data": {
-                    "events": [
-                        {
-                            "content": {
-                                "event_id": "$someplace:example.org"
-                            },
-                            "room_id": "!roomid:room.com",
-                            "type": "m.fully_read"
-                        },
-                        {
-                            "content": {
-                                "ignored_users": {
-                                    "@someone:example.org": {}
-                                }
-                            },
-                            "type": "m.ignored_user_list"
-                        }
-                    ]
-                },
-                "ephemeral": {
-                    "events": [
-                        {
-                            "content": {
-                                "$151680659217152dPKjd:localhost": {
-                                    "m.read": {
-                                        "@example:localhost": {
-                                            "ts": 1516809890615
-                                        }
-                                    }
-                                }
-                            },
-                            "type": "m.receipt"
-                        }
-                    ]
-                },
-                "state": {
-                    "events": [
-                        {
-                            "content": {
-                                "join_rule": "public"
-                            },
-                            "event_id": "$15139375514WsgmR:localhost",
-                            "origin_server_ts": 1513937551539,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.join_rules",
-                            "unsigned": {
-                                "age": 7034220355
-                            }
-                        },
-                        {
-                            "content": {
-                                "avatar_url": null,
-                                "displayname": "example",
-                                "membership": "join"
-                            },
-                            "event_id": "$151800140517rfvjc:localhost",
-                            "membership": "join",
-                            "origin_server_ts": 1518001405556,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "age": 2970366338,
-                                "replaces_state": "$151800111315tsynI:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "history_visibility": "shared"
-                            },
-                            "event_id": "$15139375515VaJEY:localhost",
-                            "origin_server_ts": 1513937551613,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.history_visibility",
-                            "unsigned": {
-                                "age": 7034220281
-                            }
-                        },
-                        {
-                            "content": {
-                                "creator": "@example:localhost"
-                            },
-                            "event_id": "$15139375510KUZHi:localhost",
-                            "origin_server_ts": 1513937551203,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.create",
-                            "unsigned": {
-                                "age": 7034220691
-                            }
-                        },
-                        {
-                            "content": {
-                                "aliases": [
-                                    "#tutorial:localhost"
-                                ]
-                            },
-                            "event_id": "$15139375516NUgtD:localhost",
-                            "origin_server_ts": 1513937551720,
-                            "sender": "@example:localhost",
-                            "state_key": "localhost",
-                            "type": "m.room.aliases",
-                            "unsigned": {
-                                "age": 7034220174
-                            }
-                        },
-                        {
-                            "content": {
-                                "topic": "\ud83d\ude00"
-                            },
-                            "event_id": "$151957878228ssqrJ:localhost",
-                            "origin_server_ts": 1519578782185,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.topic",
-                            "unsigned": {
-                                "age": 1392989709,
-                                "prev_content": {
-                                    "topic": "test"
-                                },
-                                "prev_sender": "@example:localhost",
-                                "replaces_state": "$151957069225EVYKm:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "ban": 50,
-                                "events": {
-                                    "m.room.avatar": 50,
-                                    "m.room.canonical_alias": 50,
-                                    "m.room.history_visibility": 100,
-                                    "m.room.name": 50,
-                                    "m.room.power_levels": 100
-                                },
-                                "events_default": 0,
-                                "invite": 0,
-                                "kick": 50,
-                                "redact": 50,
-                                "state_default": 50,
-                                "users": {
-                                    "@example:localhost": 100
-                                },
-                                "users_default": 0
-                            },
-                            "event_id": "$15139375512JaHAW:localhost",
-                            "origin_server_ts": 1513937551359,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.power_levels",
-                            "unsigned": {
-                                "age": 7034220535
-                            }
-                        },
-                        {
-                            "content": {
-                                "alias": "#tutorial:localhost"
-                            },
-                            "event_id": "$15139375513VdeRF:localhost",
-                            "origin_server_ts": 1513937551461,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.canonical_alias",
-                            "unsigned": {
-                                "age": 7034220433
-                            }
-                        },
-                        {
-                            "content": {
-                                "avatar_url": null,
-                                "displayname": "example2",
-                                "membership": "join"
-                            },
-                            "event_id": "$152034824468gOeNB:localhost",
-                            "membership": "join",
-                            "origin_server_ts": 1520348244605,
-                            "sender": "@example2:localhost",
-                            "state_key": "@example2:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "age": 623527289,
-                                "prev_content": {
-                                    "membership": "leave"
-                                },
-                                "prev_sender": "@example:localhost",
-                                "replaces_state": "$152034819067QWJxM:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                              "membership": "leave",
-                              "reason": "offline",
-                              "avatar_url": "avatar.com",
-                              "displayname": "example"
-                            },
-                            "event_id": "$1585345508297748AIUBh:matrix.org",
-                            "origin_server_ts": 1585345508223,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                              "replaces_state": "$1585345354296486IGZfp:localhost",
-                              "prev_content": {
-                                "avatar_url": "avatar.com",
-                                "displayname": "example",
-                                "membership": "join"
-                              },
-                              "prev_sender": "@example2:localhost",
-                              "age": 6992
-                            },
-                            "room_id": "!roomid:room.com"
-                          }
-                    ]
-                },
-                "timeline": {
-                    "events": [
-                        {
-                            "content": {
-                                "body": "baba",
-                                "format": "org.matrix.custom.html",
-                                "formatted_body": "<strong>baba</strong>",
-                                "msgtype": "m.text"
-                            },
-                            "event_id": "$152037280074GZeOm:localhost",
-                            "origin_server_ts": 1520372800469,
-                            "sender": "@example:localhost",
-                            "type": "m.room.message",
-                            "unsigned": {
-                                "age": 598971425
-                            }
-                        }
-                    ],
-                    "limited": true,
-                    "prev_batch": "t392-516_47314_0_7_1_1_1_11444_1"
-                },
-                "unread_notifications": {
-                    "highlight_count": 0,
-                    "notification_count": 11
-                }
-            }
-        },
-        "leave": {}
-    },
-    "to_device": {
-        "events": []
-    },
-    "presence": {
-        "events": [
-            {
-                "content": {
-                    "avatar_url": "mxc://localhost:wefuiwegh8742w",
-                    "currently_active": false,
-                    "last_active_ago": 1,
-                    "presence": "online",
-                    "status_msg": "Making cupcakes"
-                },
-                "sender": "@example:localhost",
-                "type": "m.presence"
-            }
-        ]
-    }
-}
diff --git a/matrix_sdk_test/test_data/sync_with_summary.json b/matrix_sdk_test/test_data/sync_with_summary.json
deleted file mode 100644
index f655b000..00000000
--- a/matrix_sdk_test/test_data/sync_with_summary.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
-    "device_one_time_keys_count": {},
-    "next_batch": "s526_47314_0_7_1_1_1_11444_1",
-    "device_lists": {
-        "changed": [
-            "@example:example.org"
-        ],
-        "left": []
-    },
-    "rooms": {
-        "invite": {},
-        "join": {
-            "!SVkFJHzfwvuaIEawgC:localhost": {
-                "summary": {
-                    "m.heroes": [
-                      "@alice:example.com",
-                      "@bob:example.com"
-                    ],
-                    "m.joined_member_count": 2,
-                    "m.invited_member_count": 0
-                  },
-                "account_data": {
-                    "events": [
-                        {
-                            "content": {
-                                "event_id": "$someplace:example.org"
-                            },
-                            "room_id": "!roomid:room.com",
-                            "type": "m.fully_read"
-                        },
-                        {
-                            "content": {
-                                "ignored_users": {
-                                    "@someone:example.org": {}
-                                }
-                            },
-                            "type": "m.ignored_user_list"
-                        }
-                    ]
-                },
-                "ephemeral": {
-                    "events": [
-                        {
-                            "content": {
-                                "$151680659217152dPKjd:localhost": {
-                                    "m.read": {
-                                        "@example:localhost": {
-                                            "ts": 1516809890615
-                                        }
-                                    }
-                                }
-                            },
-                            "type": "m.receipt"
-                        }
-                    ]
-                },
-                "state": {
-                    "events": [
-                        {
-                            "content": {
-                                "join_rule": "public"
-                            },
-                            "event_id": "$15139375514WsgmR:localhost",
-                            "origin_server_ts": 1513937551539,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.join_rules",
-                            "unsigned": {
-                                "age": 7034220355
-                            }
-                        },
-                        {
-                            "content": {
-                                "avatar_url": null,
-                                "displayname": "example",
-                                "membership": "join"
-                            },
-                            "event_id": "$151800140517rfvjc:localhost",
-                            "membership": "join",
-                            "origin_server_ts": 1518001405556,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "age": 2970366338,
-                                "replaces_state": "$151800111315tsynI:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "history_visibility": "shared"
-                            },
-                            "event_id": "$15139375515VaJEY:localhost",
-                            "origin_server_ts": 1513937551613,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.history_visibility",
-                            "unsigned": {
-                                "age": 7034220281
-                            }
-                        },
-                        {
-                            "content": {
-                                "creator": "@example:localhost"
-                            },
-                            "event_id": "$15139375510KUZHi:localhost",
-                            "origin_server_ts": 1513937551203,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.create",
-                            "unsigned": {
-                                "age": 7034220691
-                            }
-                        },
-                        {
-                            "content": {
-                                "topic": "\ud83d\ude00"
-                            },
-                            "event_id": "$151957878228ssqrJ:localhost",
-                            "origin_server_ts": 1519578782185,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.topic",
-                            "unsigned": {
-                                "age": 1392989709,
-                                "prev_content": {
-                                    "topic": "test"
-                                },
-                                "prev_sender": "@example:localhost",
-                                "replaces_state": "$151957069225EVYKm:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                                "ban": 50,
-                                "events": {
-                                    "m.room.avatar": 50,
-                                    "m.room.canonical_alias": 50,
-                                    "m.room.history_visibility": 100,
-                                    "m.room.name": 50,
-                                    "m.room.power_levels": 100
-                                },
-                                "events_default": 0,
-                                "invite": 0,
-                                "kick": 50,
-                                "redact": 50,
-                                "state_default": 50,
-                                "users": {
-                                    "@example:localhost": 100
-                                },
-                                "users_default": 0
-                            },
-                            "event_id": "$15139375512JaHAW:localhost",
-                            "origin_server_ts": 1513937551359,
-                            "sender": "@example:localhost",
-                            "state_key": "",
-                            "type": "m.room.power_levels",
-                            "unsigned": {
-                                "age": 7034220535
-                            }
-                        },
-                        {
-                            "content": {
-                                "avatar_url": null,
-                                "displayname": "example2",
-                                "membership": "join"
-                            },
-                            "event_id": "$152034824468gOeNB:localhost",
-                            "membership": "join",
-                            "origin_server_ts": 1520348244605,
-                            "sender": "@example2:localhost",
-                            "state_key": "@example2:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                                "age": 623527289,
-                                "prev_content": {
-                                    "membership": "leave"
-                                },
-                                "prev_sender": "@example:localhost",
-                                "replaces_state": "$152034819067QWJxM:localhost"
-                            }
-                        },
-                        {
-                            "content": {
-                              "membership": "leave",
-                              "reason": "offline",
-                              "avatar_url": "avatar.com",
-                              "displayname": "example"
-                            },
-                            "event_id": "$1585345508297748AIUBh:matrix.org",
-                            "origin_server_ts": 1585345508223,
-                            "sender": "@example:localhost",
-                            "state_key": "@example:localhost",
-                            "type": "m.room.member",
-                            "unsigned": {
-                              "replaces_state": "$1585345354296486IGZfp:localhost",
-                              "prev_content": {
-                                "avatar_url": "avatar.com",
-                                "displayname": "example",
-                                "membership": "join"
-                              },
-                              "prev_sender": "@example2:localhost",
-                              "age": 6992
-                            },
-                            "room_id": "!roomid:room.com"
-                          }
-                    ]
-                },
-                "timeline": {
-                    "events": [
-                        {
-                            "content": {
-                                "body": "baba",
-                                "format": "org.matrix.custom.html",
-                                "formatted_body": "<strong>baba</strong>",
-                                "msgtype": "m.text"
-                            },
-                            "event_id": "$152037280074GZeOm:localhost",
-                            "origin_server_ts": 1520372800469,
-                            "sender": "@example:localhost",
-                            "type": "m.room.message",
-                            "unsigned": {
-                                "age": 598971425
-                            }
-                        }
-                    ],
-                    "limited": true,
-                    "prev_batch": "t392-516_47314_0_7_1_1_1_11444_1"
-                },
-                "unread_notifications": {
-                    "highlight_count": 0,
-                    "notification_count": 11
-                }
-            }
-        },
-        "leave": {}
-    },
-    "to_device": {
-        "events": []
-    },
-    "presence": {
-        "events": [
-            {
-                "content": {
-                    "avatar_url": "mxc://localhost:wefuiwegh8742w",
-                    "currently_active": false,
-                    "last_active_ago": 1,
-                    "presence": "online",
-                    "status_msg": "Making cupcakes"
-                },
-                "sender": "@example:localhost",
-                "type": "m.presence"
-            }
-        ]
-    }
-}
diff --git a/matrix_sdk_test/test_data/upload_response.json b/matrix_sdk_test/test_data/upload_response.json
deleted file mode 100644
index 24845bf9..00000000
--- a/matrix_sdk_test/test_data/upload_response.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "content_uri": "mxc://example.com/AQwafuaFswefuhsfAFAgsw"
-}
diff --git a/test_data/more_sync.json b/test_data/more_sync.json
index 27b2e8d6..f487281c 100644
--- a/test_data/more_sync.json
+++ b/test_data/more_sync.json
@@ -92,6 +92,28 @@
                             "type": "m.room.redaction",
                             "redacts": "$151957878228ssqrj:localhost"
                         },
+                        {
+                            "content": {},
+                            "event_id": "$15275046980maRLj:localhost",
+                            "origin_server_ts": 1527504698685,
+                            "sender": "@example:localhost",
+                            "type": "m.room.message",
+                            "unsigned": {
+                                "age": 19334,
+                                "redacted_because": {
+                                    "content": {},
+                                    "event_id": "$15275047031IXQRi:localhost",
+                                    "origin_server_ts": 1527504703496,
+                                    "redacts": "$15275046980maRLj:localhost",
+                                    "sender": "@example:localhost",
+                                    "type": "m.room.redaction",
+                                    "unsigned": {
+                                        "age": 14523
+                                    }
+                                },
+                                "redacted_by": "$15275047031IXQRi:localhost"
+                            }
+                        },
                         {
                             "content": {
                                 "m.relates_to": {