diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_address_activation.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_address_activation.yaml
new file mode 100644
index 0000000..417907a
--- /dev/null
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_address_activation.yaml
@@ -0,0 +1,592 @@
+interactions:
+- request:
+    body: mail_host=example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/domains
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/domains/example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode '{"base_url": "http://example.com", "description":
+        null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host":
+        "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com",
+        "url_host": "example.com"}'}
+    headers:
+      content-length: ['233']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: fqdn_listname=foo%40example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/lists
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/lists/foo.example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/lists/foo.example.com
+  response:
+    body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com",
+        "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com",
+        "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link":
+        "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'}
+    headers:
+      content-length: ['294']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: display_name=None&list_id=foo.example.com&subscriber=subscribed%40example.org
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/members
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"244ad281ce0937d4369ac0b39044e359b464c006\"",
+        "token": "617c0d27255768ccede8c62edad29f0dade35601", "token_owner": "subscriber"}'}
+    headers:
+      content-length: ['143']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 202, message: Accepted}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/lists/foo@example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: mail_host=example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/domains
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/domains/example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode '{"base_url": "http://example.com", "description":
+        null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host":
+        "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com",
+        "url_host": "example.com"}'}
+    headers:
+      content-length: ['233']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: fqdn_listname=foo%40example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/lists
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/lists/foo.example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/lists/foo.example.com
+  response:
+    body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com",
+        "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com",
+        "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link":
+        "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'}
+    headers:
+      content-length: ['294']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: display_name=None&list_id=foo.example.com&subscriber=subscribed%40example.org
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/members
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"05026f6a5f6e62a5787d48ee2a3489c788f71212\"",
+        "token": "d8d679afd8f787f9259997d56aaf5f80f753f7a3", "token_owner": "subscriber"}'}
+    headers:
+      content-length: ['143']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 202, message: Accepted}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/lists/foo@example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: mail_host=example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/domains
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/domains/example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode '{"base_url": "http://example.com", "description":
+        null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host":
+        "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com",
+        "url_host": "example.com"}'}
+    headers:
+      content-length: ['233']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: fqdn_listname=foo%40example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/lists
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/lists/foo.example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/lists/foo.example.com
+  response:
+    body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com",
+        "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com",
+        "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link":
+        "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'}
+    headers:
+      content-length: ['294']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: display_name=None&list_id=foo.example.com&subscriber=subscribed%40example.org
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/members
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"0622c1528bc8361937513c083ae88acedc6aaf77\"",
+        "token": "58bf3076ae2014a48f5de91480c49a5aac717841", "token_owner": "subscriber"}'}
+    headers:
+      content-length: ['143']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 202, message: Accepted}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/expired@example.org
+  response:
+    body: {string: !!python/unicode 404 Not Found}
+    headers:
+      content-length: ['13']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 404, message: Not Found}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/lists/foo@example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: mail_host=example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/domains
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/domains/example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode '{"base_url": "http://example.com", "description":
+        null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host":
+        "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com",
+        "url_host": "example.com"}'}
+    headers:
+      content-length: ['233']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: fqdn_listname=foo%40example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/lists
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/lists/foo.example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/lists/foo.example.com
+  response:
+    body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com",
+        "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com",
+        "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link":
+        "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'}
+    headers:
+      content-length: ['294']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: display_name=None&list_id=foo.example.com&subscriber=subscribed%40example.org
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/members
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"f42b3613dcf00ea761bc03a394019698ff959fb2\"",
+        "token": "c8c0e7e54396de27b04afdc7905f23b19bed3319", "token_owner": "subscriber"}'}
+    headers:
+      content-length: ['143']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 202, message: Accepted}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/subscribed@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "display_name":
+        "None", "http_etag": "\"d5924f9c3590feabf8a641335713bed5cd663212\"", "is_server_owner":
+        false, "self_link": "http://localhost:9001/3.0/users/1527", "user_id": 1527}'}
+    headers:
+      content-length: ['218']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/lists/foo@example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: mail_host=example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/domains
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/domains/example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode '{"base_url": "http://example.com", "description":
+        null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host":
+        "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com",
+        "url_host": "example.com"}'}
+    headers:
+      content-length: ['233']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: fqdn_listname=foo%40example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/lists
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/lists/foo.example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/lists/foo.example.com
+  response:
+    body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com",
+        "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com",
+        "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link":
+        "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'}
+    headers:
+      content-length: ['294']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: display_name=None&list_id=foo.example.com&subscriber=subscribed%40example.org
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/members
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"6fd2efa57c024cd458a13b5e857ce7604980810b\"",
+        "token": "fdea25c6056d29e827ac4de0681eb05a85785daf", "token_owner": "subscriber"}'}
+    headers:
+      content-length: ['143']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 202, message: Accepted}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/lists/foo@example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: mail_host=example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/domains
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/domains/example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode '{"base_url": "http://example.com", "description":
+        null, "http_etag": "\"e736411818ff1815ca83575e0958c38c5188f0a4\"", "mail_host":
+        "example.com", "self_link": "http://localhost:9001/3.0/domains/example.com",
+        "url_host": "example.com"}'}
+    headers:
+      content-length: ['233']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: fqdn_listname=foo%40example.com
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/lists
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+      location: ['http://localhost:9001/3.0/lists/foo.example.com']
+    status: {code: 201, message: Created}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/lists/foo.example.com
+  response:
+    body: {string: !!python/unicode '{"display_name": "Foo", "fqdn_listname": "foo@example.com",
+        "http_etag": "\"698a819bbb6b902096a8c5543cc7fac2328960d5\"", "list_id": "foo.example.com",
+        "list_name": "foo", "mail_host": "example.com", "member_count": 0, "self_link":
+        "http://localhost:9001/3.0/lists/foo.example.com", "volume": 1}'}
+    headers:
+      content-length: ['294']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: display_name=None&list_id=foo.example.com&subscriber=subscribed%40example.org
+    headers:
+      accept-encoding: ['gzip, deflate']
+      !!python/unicode content-type: [!!python/unicode application/x-www-form-urlencoded]
+    method: !!python/unicode POST
+    uri: http://localhost:9001/3.0/members
+  response:
+    body: {string: !!python/unicode '{"http_etag": "\"7cbc137b10520d2d4d25297171b35c4f95aca43e\"",
+        "token": "f9e5fcd7b8413d8e76b53e8da745bd060424c572", "token_owner": "subscriber"}'}
+    headers:
+      content-length: ['143']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 202, message: Accepted}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/very_new_email@example.org
+  response:
+    body: {string: !!python/unicode 404 Not Found}
+    headers:
+      content-length: ['13']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 404, message: Not Found}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/lists/foo@example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode DELETE
+    uri: http://localhost:9001/3.0/domains/example.com
+  response:
+    body: {string: !!python/unicode ''}
+    headers:
+      content-length: ['0']
+    status: {code: 204, message: No Content}
+version: 1
diff --git a/src/postorius/tests/fixtures/vcr_cassettes/test_user_profile.yaml b/src/postorius/tests/fixtures/vcr_cassettes/test_user_profile.yaml
index 5b482fb..7afa15b 100644
--- a/src/postorius/tests/fixtures/vcr_cassettes/test_user_profile.yaml
+++ b/src/postorius/tests/fixtures/vcr_cassettes/test_user_profile.yaml
@@ -34,19 +34,31 @@
     body: {string: !!python/unicode ''}
     headers:
       content-length: ['0']
-      location: ['http://localhost:9001/3.0/users/1452']
+      location: ['http://localhost:9001/3.0/users/1526']
     status: {code: 201, message: Created}
 - request:
     body: null
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode GET
-    uri: http://localhost:9001/3.0/users/1452
+    uri: http://localhost:9001/3.0/users/new_address@example.org
+  response:
+    body: {string: !!python/unicode 404 Not Found}
+    headers:
+      content-length: ['13']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 404, message: Not Found}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/1526
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]
@@ -59,9 +71,9 @@
     uri: http://localhost:9001/3.0/users/les@example.org
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]
@@ -71,12 +83,12 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode GET
-    uri: http://localhost:9001/3.0/users/1452/addresses
+    uri: http://localhost:9001/3.0/users/1526/addresses
   response:
     body: {string: !!python/unicode '{"entries": [{"email": "les@example.org", "http_etag":
-        "\"38f1ed5f40fa3c4932188d7190b4255b94ab3d44\"", "original_email": "les@example.org",
+        "\"bc85297a34f76fa60759c2b4f15035084262016c\"", "original_email": "les@example.org",
         "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/les@example.org",
-        "user": "http://localhost:9001/3.0/users/1452"}], "http_etag": "\"6275f83a44f1382760aac2c0d31f2ac31f4ae436\"",
+        "user": "http://localhost:9001/3.0/users/1526"}], "http_etag": "\"a1cb0979c0e9dbb5d2eff3b5fba580b0c1811388\"",
         "start": 0, "total_size": 1}'}
     headers:
       content-length: ['387']
@@ -90,9 +102,9 @@
     uri: http://localhost:9001/3.0/users/les@example.org
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]
@@ -105,9 +117,9 @@
     uri: http://localhost:9001/3.0/users/les@example.org
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]
@@ -117,12 +129,12 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode GET
-    uri: http://localhost:9001/3.0/users/1452/addresses
+    uri: http://localhost:9001/3.0/users/1526/addresses
   response:
     body: {string: !!python/unicode '{"entries": [{"email": "les@example.org", "http_etag":
-        "\"38f1ed5f40fa3c4932188d7190b4255b94ab3d44\"", "original_email": "les@example.org",
+        "\"bc85297a34f76fa60759c2b4f15035084262016c\"", "original_email": "les@example.org",
         "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/les@example.org",
-        "user": "http://localhost:9001/3.0/users/1452"}], "http_etag": "\"6275f83a44f1382760aac2c0d31f2ac31f4ae436\"",
+        "user": "http://localhost:9001/3.0/users/1526"}], "http_etag": "\"a1cb0979c0e9dbb5d2eff3b5fba580b0c1811388\"",
         "start": 0, "total_size": 1}'}
     headers:
       content-length: ['387']
@@ -136,9 +148,9 @@
     uri: http://localhost:9001/3.0/users/les@example.org
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]
@@ -148,12 +160,24 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/new_address@example.org
+  response:
+    body: {string: !!python/unicode 404 Not Found}
+    headers:
+      content-length: ['13']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 404, message: Not Found}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
     uri: http://localhost:9001/3.0/users/les@example.org
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]
@@ -163,12 +187,12 @@
     headers:
       accept-encoding: ['gzip, deflate']
     method: !!python/unicode GET
-    uri: http://localhost:9001/3.0/users/1452/addresses
+    uri: http://localhost:9001/3.0/users/1526/addresses
   response:
     body: {string: !!python/unicode '{"entries": [{"email": "les@example.org", "http_etag":
-        "\"38f1ed5f40fa3c4932188d7190b4255b94ab3d44\"", "original_email": "les@example.org",
+        "\"bc85297a34f76fa60759c2b4f15035084262016c\"", "original_email": "les@example.org",
         "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/les@example.org",
-        "user": "http://localhost:9001/3.0/users/1452"}], "http_etag": "\"6275f83a44f1382760aac2c0d31f2ac31f4ae436\"",
+        "user": "http://localhost:9001/3.0/users/1526"}], "http_etag": "\"a1cb0979c0e9dbb5d2eff3b5fba580b0c1811388\"",
         "start": 0, "total_size": 1}'}
     headers:
       content-length: ['387']
@@ -182,9 +206,159 @@
     uri: http://localhost:9001/3.0/users/les@example.org
   response:
     body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
-        "\"31035794349e65438eb291c6f4339800f0f12310\"", "is_server_owner": false,
-        "password": "$6$rounds=611965$1eGBP9dokXqypLRH$cDtIO3ZHr7NzdkEx/NQaiCAd/eQZ63vDR.g4rbWCtkdGuyVel7BPjLNJpfeSr6ietFu1XqXv3nM9Fzji5p0jS.",
-        "self_link": "http://localhost:9001/3.0/users/1452", "user_id": 1452}'}
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
+    headers:
+      content-length: ['330']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/les@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
+    headers:
+      content-length: ['330']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/1526/addresses
+  response:
+    body: {string: !!python/unicode '{"entries": [{"email": "les@example.org", "http_etag":
+        "\"bc85297a34f76fa60759c2b4f15035084262016c\"", "original_email": "les@example.org",
+        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/les@example.org",
+        "user": "http://localhost:9001/3.0/users/1526"}], "http_etag": "\"a1cb0979c0e9dbb5d2eff3b5fba580b0c1811388\"",
+        "start": 0, "total_size": 1}'}
+    headers:
+      content-length: ['387']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/les@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
+    headers:
+      content-length: ['330']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/new_address@example.org
+  response:
+    body: {string: !!python/unicode 404 Not Found}
+    headers:
+      content-length: ['13']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 404, message: Not Found}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/les@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
+    headers:
+      content-length: ['330']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/1526/addresses
+  response:
+    body: {string: !!python/unicode '{"entries": [{"email": "les@example.org", "http_etag":
+        "\"bc85297a34f76fa60759c2b4f15035084262016c\"", "original_email": "les@example.org",
+        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/les@example.org",
+        "user": "http://localhost:9001/3.0/users/1526"}], "http_etag": "\"a1cb0979c0e9dbb5d2eff3b5fba580b0c1811388\"",
+        "start": 0, "total_size": 1}'}
+    headers:
+      content-length: ['387']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/les@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
+    headers:
+      content-length: ['330']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/les@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
+    headers:
+      content-length: ['330']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/1526/addresses
+  response:
+    body: {string: !!python/unicode '{"entries": [{"email": "les@example.org", "http_etag":
+        "\"bc85297a34f76fa60759c2b4f15035084262016c\"", "original_email": "les@example.org",
+        "registered_on": "2005-08-01T07:49:23", "self_link": "http://localhost:9001/3.0/addresses/les@example.org",
+        "user": "http://localhost:9001/3.0/users/1526"}], "http_etag": "\"a1cb0979c0e9dbb5d2eff3b5fba580b0c1811388\"",
+        "start": 0, "total_size": 1}'}
+    headers:
+      content-length: ['387']
+      content-type: [application/json; charset=utf-8]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      accept-encoding: ['gzip, deflate']
+    method: !!python/unicode GET
+    uri: http://localhost:9001/3.0/users/les@example.org
+  response:
+    body: {string: !!python/unicode '{"created_on": "2005-08-01T07:49:23", "http_etag":
+        "\"ce66943f3314f292f4fb48ae1e5cbe7004c6c1a3\"", "is_server_owner": false,
+        "password": "$6$rounds=627500$sP7o2jMJBoFzc9qN$hgtxLB1aByTHjY5RvLo3xAWLB2U0GoSEN6Ig9ucya/O35fxyVY3U53WoauYuexoaq4L35pqqCVz4EJkQKXK9F1",
+        "self_link": "http://localhost:9001/3.0/users/1526", "user_id": 1526}'}
     headers:
       content-length: ['330']
       content-type: [application/json; charset=utf-8]