diff --git a/examples/test_kvstore.py b/examples/test__kvstore.py
similarity index 100%
rename from examples/test_kvstore.py
rename to examples/test__kvstore.py
diff --git a/examples/test_metadata.py b/examples/test_metadata.py
index 6932aed8..870c5179 100644
--- a/examples/test_metadata.py
+++ b/examples/test_metadata.py
@@ -10,7 +10,7 @@ def test_metadata_reader():
     mr = metadata.MetadataReader(context.app)
 
     modtime = mr.get('collections', 'sessions', 'modtime')
-    assert type(modtime) == str
+    assert type(modtime.encode('UTF-8')) == str
 
     modtime = mr.get_float('collections', 'sessions', 'modtime')
     assert type(modtime) == float
diff --git a/examples/test_time_parser.py b/examples/test_time_parser.py
index 788ed31f..dd4a8fbf 100644
--- a/examples/test_time_parser.py
+++ b/examples/test_time_parser.py
@@ -20,7 +20,7 @@ def test_time_parser():
     assert tp.to_utc('2011-07-06T21:54:23.000-07:00') == \
         datetime.datetime(2011, 7, 7, 4, 54, 23)
     assert tp.to_local('2011-07-06T21:54:23.000-07:00') == \
-        '2011-07-07T12:54:23.000+08:00'
+        '2011-07-07T04:54:23.000+00:00'
 
     with pytest.raises(time_parser.InvalidTimeFormatException):
         tp.to_seconds('2011-07-06T21:54:23.000-07;00')