diff --git a/.travis.yml b/.travis.yml
index 04537552c..23eb20206 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,7 +56,7 @@ jobs:
     - stage: test
       python: 3.6
       env:
-        - PLEX_CONTAINER_TAG=1.3.2.3112-1751929
+        - PLEX_CONTAINER_TAG=1.10.1.4602-f54242b6b
         - TEST_ACCOUNT_ONCE=1
     - stage: test
       python: 3.6
diff --git a/plexapi/library.py b/plexapi/library.py
index 4b061682c..14aa28e67 100644
--- a/plexapi/library.py
+++ b/plexapi/library.py
@@ -378,13 +378,13 @@ def get(self, title):
         return self.fetchItem(key, title__iexact=title)
 
     def all(self, sort=None, **kwargs):
-        """ Returns a list of media from this library section. 
-        
+        """ Returns a list of media from this library section.
+
             Parameters:
                     sort (string): The sort string
         """
         sortStr = ''
-        if sort != None:
+        if sort is not None:
             sortStr = '?sort=' + sort
         
         key = '/library/sections/%s/all%s' % (self.key, sortStr)
diff --git a/plexapi/media.py b/plexapi/media.py
index e33df03e1..5badc2be7 100644
--- a/plexapi/media.py
+++ b/plexapi/media.py
@@ -124,19 +124,19 @@ def audioStreams(self):
     def subtitleStreams(self):
         """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects in this MediaPart. """
         return [stream for stream in self.streams if stream.streamType == SubtitleStream.STREAMTYPE]
-        
+
     def setDefaultAudioStream(self, stream):
         """ Set the default :class:`~plexapi.media.AudioStream` for this MediaPart.
 
             Parameters:
-                stream (:class:`~plexapi.media.AudioStream`): AudioStream to set as default 
+                stream (:class:`~plexapi.media.AudioStream`): AudioStream to set as default
         """
         if isinstance(stream, AudioStream):
             key = "/library/parts/%d?audioStreamID=%d&allParts=1" % (self.id, stream.id)
         else:
             key = "/library/parts/%d?audioStreamID=%d&allParts=1" % (self.id, stream)
         self._server.query(key, method=self._server._session.put)
-            
+
     def setDefaultSubtitleStream(self, stream):
         """ Set the default :class:`~plexapi.media.SubtitleStream` for this MediaPart.
             
@@ -148,12 +148,13 @@ def setDefaultSubtitleStream(self, stream):
         else:
             key = "/library/parts/%d?subtitleStreamID=%d&allParts=1" % (self.id, stream)
         self._server.query(key, method=self._server._session.put)
-        
+
     def resetDefaultSubtitleStream(self):
         """ Set default subtitle of this MediaPart to 'none'. """
         key = "/library/parts/%d?subtitleStreamID=0&allParts=1" % (self.id)
         self._server.query(key, method=self._server._session.put)
 
+
 class MediaPartStream(PlexObject):
     """ Base class for media streams. These consist of video, audio and subtitles.
 
diff --git a/tests/conftest.py b/tests/conftest.py
index fc5a15a3b..aae10c835 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -40,7 +40,7 @@
 FRAMERATES = {'24p', 'PAL', 'NTSC'}
 PROFILES = {'advanced simple', 'main', 'constrained baseline'}
 RESOLUTIONS = {'sd', '480', '576', '720', '1080'}
-ENTITLEMENTS = {'ios', 'cpms', 'roku', 'android', 'xbox_one', 'xbox_360', 'windows', 'windows_phone'}
+ENTITLEMENTS = {'ios', 'roku', 'android', 'xbox_one', 'xbox_360', 'windows', 'windows_phone'}
 
 TEST_AUTHENTICATED = 'authenticated'
 TEST_ANONYMOUSLY = 'anonymously'
diff --git a/tests/test_video.py b/tests/test_video.py
index 5d9c114d1..1c92069a0 100644
--- a/tests/test_video.py
+++ b/tests/test_video.py
@@ -118,7 +118,7 @@ def test_video_Movie_attrs(movies):
     assert float(movie.rating) >= 6.4
     #assert movie.ratingImage == 'rottentomatoes://image.rating.ripe'
     assert movie.ratingKey >= 1
-    assert sorted([i.tag for i in movie.roles])[:4] == ['Aladdin Ullah', 'Annette Hanshaw', 'Aseem Chhabra', 'Bhavana Nagulapally']  # noqa
+    assert set(sorted([i.tag for i in movie.roles])) >= {'Aladdin Ullah', 'Annette Hanshaw', 'Aseem Chhabra', 'Debargo Sanyal'}  # noqa
     assert movie._server._baseurl == utils.SERVER_BASEURL
     assert movie.sessionKey is None
     assert movie.studio == 'Nina Paley'