diff --git a/src/tests/settings.py b/src/tests/settings.py
index 326977d..8c50f19 100644
--- a/src/tests/settings.py
+++ b/src/tests/settings.py
@@ -16,24 +16,24 @@
 #      specific language governing permissions and limitations
 #      under the License.
 #
-from cmislib.atompub_binding import AtomPubBinding
-from cmislib.browser_binding import BrowserBinding
+from cmislib.atompub.binding import AtomPubBinding
+from cmislib.browser.binding import BrowserBinding
 
 #
 # Override these settings with values to match your environment.
 #
 # CMIS repository's service URL
 #REPOSITORY_URL = 'http://cmis.alfresco.com/s/cmis' # Alfresco demo
-#REPOSITORY_URL = 'http://localhost:8080/chemistry/atom' # Apache Chemistry AtomPub
-REPOSITORY_URL = 'http://localhost:8080/chemistry/browser' # Apache Chemistry Browser
+REPOSITORY_URL = 'http://localhost:8081/chemistry/atom' # Apache Chemistry AtomPub
+#REPOSITORY_URL = 'http://localhost:8081/chemistry/browser' # Apache Chemistry Browser
 #REPOSITORY_URL = 'http://localhost:8080/alfresco/cmisatom'  # Alfresco 4.0 AtomPub
 #REPOSITORY_URL = 'http://localhost:8080/alfresco/s/api/cmis'  # Alfresco
 #REPOSITORY_URL = 'http://cmis.demo.nuxeo.org/nuxeo/atom/cmis' # Nuxeo demo
 #REPOSITORY_URL = 'http://localhost:8080/nuxeo/atom/cmis' # Nuxeo local
 
 # Choose a binding. The AtomPubBinding is the only one you should really be using right now
-#BINDING = AtomPubBinding()
-BINDING = BrowserBinding()
+BINDING = AtomPubBinding()
+#BINDING = BrowserBinding()
 
 # CMIS repository credentials
 USERNAME = 'admin'  # Alfresco