diff --git a/examples/client_test.py b/examples/client_test.py
index 7ed24cc..d620f68 100644
--- a/examples/client_test.py
+++ b/examples/client_test.py
@@ -3,6 +3,7 @@
 from pywiremock.helpers import *
 import requests
 
+default_mapping_count = 5
 
 # Note: this assumes that there is a WireMock instance running locally on 7890, with the mappings defined in 'sample'
 class ClientTest(unittest.TestCase):
@@ -16,7 +17,7 @@ def tearDown(self):
     def test_list_all_stub_mappings(self):
         mappings = self._sample_server.list_all_stub_mappings()
 
-        self.assertEqual(5, mappings['meta']['total'])
+        self.assertEqual(default_mapping_count, mappings['meta']['total'])
         self.assertIsNotNone(mappings['mappings'])
 
     def test_add_stub_mapping(self):
@@ -26,7 +27,7 @@ def test_add_stub_mapping(self):
             created_stubs[k] = self._sample_server.add_stub_mapping(v)
 
         all_stubs = self._sample_server.list_all_stub_mappings()
-        self.assertEqual(5+len(new_stubs), all_stubs['meta']['total'])
+        self.assertEqual(default_mapping_count+len(new_stubs), all_stubs['meta']['total'])
 
     def test_reset_mappings(self):
         pass
@@ -44,7 +45,7 @@ def test_reset_to_default_mappings(self):
         self._sample_server.reset_to_default_mappings()
 
         mappings = self._sample_server.list_all_stub_mappings()
-        self.assertEqual(5, mappings['meta']['total'])
+        self.assertEqual(default_mapping_count, mappings['meta']['total'])
 
     def test_get_stub_mapping(self):
         new_request = get(url_matching('/api/defined/test'))
@@ -175,7 +176,7 @@ def test_find_near_misses_for_unmatched_results(self):
 
     def test_start_recording_stop_recording_get_recording_status(self):
         recording_status = self._sample_server.get_recording_status()
-        self.assertEqual('Stopped', recording_status['status'])
+        self.assertEqual('NeverStarted', recording_status['status'])
 
         recording = record_spec().for_target('http://example.mocklab.io')
         self._sample_server.start_recording(recording)
diff --git a/examples/standalone.py b/examples/standalone.py
index 46c5e52..67c0ac5 100644
--- a/examples/standalone.py
+++ b/examples/standalone.py
@@ -69,7 +69,7 @@ def test_attach_to_standalone_and_define_method_then_get(self):
 
         # Verify
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.content, 'defined content')
+        self.assertEqual(result.text, 'defined content')
 
         self._sample_server.verify(1, new_request)
 
@@ -85,7 +85,7 @@ def test_attach_to_standalone_and_define_method_then_post(self):
 
         # Verify
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.content, 'defined content')
+        self.assertEqual(result.text, 'defined content')
 
         self._sample_server.verify(1, new_request)
 
@@ -101,7 +101,7 @@ def test_attach_to_standalone_and_define_method_then_put(self):
 
         # Verify
         self.assertEqual(result.status_code, 200)
-        self.assertEqual(result.content, 'defined content')
+        self.assertEqual(result.text, 'defined content')
 
         self._sample_server.verify(1, new_request)
 
diff --git a/pywiremock/helpers.py b/pywiremock/helpers.py
index 601c352..5f63fc1 100644
--- a/pywiremock/helpers.py
+++ b/pywiremock/helpers.py
@@ -1,4 +1,4 @@
-import mappings
+import pywiremock.mappings as mappings
 
 
 def stub_for(request_mapping):
diff --git a/setup.py b/setup.py
index efe4330..3a91b9d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 import setuptools
 
-with open('README.md', 'rb') as r_file:
+with open('README.md', 'r') as r_file:
     LDINFO = r_file.read()
 
 required = [
@@ -10,7 +10,7 @@
 
 setuptools.setup(
     name="pywiremock",
-    version="2.11.0-5",
+    version="2.11.0-6",
     author="AnObfuscator",
     author_email="anobfuscator@gmail.com",
     description="An implementation of the WireMock REST API in Python.",
@@ -23,6 +23,8 @@
         'Intended Audience :: Developers',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Utilities',
-        'Topic :: Software Development :: Libraries :: Python Modules']
-)
\ No newline at end of file
+        'Topic :: Software Development :: Libraries :: Python Modules'
+    ]
+)