diff --git a/test/change.test.js b/test/change.test.js
index 6192bda5..8c76b7af 100644
--- a/test/change.test.js
+++ b/test/change.test.js
@@ -6,9 +6,13 @@ describe('Change', function() {
     var memory = loopback.createDataSource({
       connector: loopback.Memory
     });
-    TestModel = loopback.PersistedModel.extend('chtest', {}, {
-      trackChanges: true
-    });
+    TestModel = loopback.PersistedModel.extend('ChangeTestModel',
+      {
+        id: { id: true, type: 'string', defaultFn: 'guid' }
+      },
+      {
+        trackChanges: true
+      });
     this.modelName = TestModel.modelName;
     TestModel.attachTo(memory);
     Change = TestModel.getChangeModel();
diff --git a/test/model.test.js b/test/model.test.js
index ad6c305f..db05e13e 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -16,7 +16,7 @@ describe('Model / PersistedModel', function() {
 
   describe('Model.validatesUniquenessOf(property, options)', function() {
     it('Ensure the value for `property` is unique', function(done) {
-      var User = PersistedModel.extend('user', {
+      var User = PersistedModel.extend('ValidatedUser', {
         'first': String,
         'last': String,
         'age': Number,
@@ -72,6 +72,7 @@ describe.onServer('Remote Methods', function() {
 
   beforeEach(function() {
     User = PersistedModel.extend('user', {
+      id: { id: true, type: String, defaultFn: 'guid' },
       'first': String,
       'last': String,
       'age': Number,
@@ -489,10 +490,10 @@ describe.onServer('Remote Methods', function() {
     });
   });
 
-  describe('PersistelModel remote methods', function() {
+  describe('PersistedModel remote methods', function() {
     it('includes all aliases', function() {
       var app = loopback();
-      var model = PersistedModel.extend('persistedModel');
+      var model = PersistedModel.extend('PersistedModelForAliases');
       app.dataSource('db', { connector: 'memory' });
       app.model(model, { dataSource: 'db' });
 
@@ -500,7 +501,7 @@ describe.onServer('Remote Methods', function() {
       var metadata = app.handler('rest')
         .adapter
         .getClasses()
-        .filter(function(c) { return c.name === 'persistedModel'; })[0];
+        .filter(function(c) { return c.name === model.modelName; })[0];
 
       var methodNames = [];
       metadata.methods.forEach(function(method) {
@@ -509,7 +510,11 @@ describe.onServer('Remote Methods', function() {
       });
 
       expect(methodNames).to.have.members([
-        'destroyAll', 'deleteAll', 'remove',
+        // NOTE(bajtos) These three methods are disabled by default
+        // Because all tests share the same global registry model
+        // and one of the tests was enabling remoting of "destroyAll",
+        // this test was seeing this method (with all aliases) as public
+        // 'destroyAll', 'deleteAll', 'remove',
         'create',
         'upsert', 'updateOrCreate',
         'exists',
diff --git a/test/remote-connector.test.js b/test/remote-connector.test.js
index 39a078e8..e267c2e8 100644
--- a/test/remote-connector.test.js
+++ b/test/remote-connector.test.js
@@ -20,7 +20,8 @@ describe('RemoteConnector', function() {
       });
     },
     onDefine: function(Model) {
-      var RemoteModel = Model.extend(Model.modelName);
+      var RemoteModel = Model.extend('Remote' + Model.modelName, {},
+        { plural: Model.pluralModelName });
       RemoteModel.attachTo(loopback.createDataSource({
         connector: loopback.Memory
       }));
diff --git a/test/replication.test.js b/test/replication.test.js
index 260e75d6..83575f6f 100644
--- a/test/replication.test.js
+++ b/test/replication.test.js
@@ -14,14 +14,16 @@ describe('Replication / Change APIs', function() {
     dataSource = this.dataSource = loopback.createDataSource({
       connector: loopback.Memory
     });
-    SourceModel = this.SourceModel = PersistedModel.extend('SourceModel', {}, {
-      trackChanges: true
-    });
+    SourceModel = this.SourceModel = PersistedModel.extend('SourceModel',
+      { id: { id: true, type: String, defaultFn: 'guid' } },
+      { trackChanges: true });
+
     SourceModel.attachTo(dataSource);
 
-    TargetModel = this.TargetModel = PersistedModel.extend('TargetModel', {}, {
-      trackChanges: true
-    });
+    TargetModel = this.TargetModel = PersistedModel.extend('TargetModel',
+      { id: { id: true, type: String, defaultFn: 'guid' } },
+      { trackChanges: true });
+
     TargetModel.attachTo(dataSource);
 
     test.startingCheckpoint = -1;
@@ -169,11 +171,11 @@ describe('Replication / Change APIs', function() {
       var test = this;
       this.conflict.models(function(err, source, target) {
         assert.deepEqual(source.toJSON(), {
-          id: 1,
+          id: test.model.id,
           name: 'source update'
         });
         assert.deepEqual(target.toJSON(), {
-          id: 1,
+          id: test.model.id,
           name: 'target update'
         });
         done();
@@ -242,7 +244,7 @@ describe('Replication / Change APIs', function() {
       this.conflict.models(function(err, source, target) {
         assert.equal(source, null);
         assert.deepEqual(target.toJSON(), {
-          id: 1,
+          id: test.model.id,
           name: 'target update'
         });
         done();
@@ -311,7 +313,7 @@ describe('Replication / Change APIs', function() {
       this.conflict.models(function(err, source, target) {
         assert.equal(target, null);
         assert.deepEqual(source.toJSON(), {
-          id: 1,
+          id: test.model.id,
           name: 'source update'
         });
         done();
diff --git a/test/util/model-tests.js b/test/util/model-tests.js
index 9a72e861..487e9820 100644
--- a/test/util/model-tests.js
+++ b/test/util/model-tests.js
@@ -36,7 +36,8 @@ module.exports = function defineModelTestsWithDataSource(options) {
         return extendedModel;
       };
 
-      User = PersistedModel.extend('user', {
+      User = PersistedModel.extend('UtilUser', {
+        id: { id: true, type: String, defaultFn: 'guid' },
         'first': String,
         'last': String,
         'age': Number,
@@ -48,8 +49,6 @@ module.exports = function defineModelTestsWithDataSource(options) {
         trackChanges: true
       });
 
-      // enable destroy all for testing
-      User.destroyAll.shared = true;
       User.attachTo(dataSource);
     });
 
@@ -187,10 +186,13 @@ module.exports = function defineModelTestsWithDataSource(options) {
       it('Remove a model from the attached data source', function(done) {
         User.create({first: 'joe', last: 'bob'}, function(err, user) {
           User.findById(user.id, function(err, foundUser) {
+            if (err) return done(err);
             assert.equal(user.id, foundUser.id);
-            foundUser.destroy(function() {
-              User.findById(user.id, function(err, notFound) {
-                assert.equal(notFound, null);
+            User.deleteById(foundUser.id, function(err) {
+              if (err) return done(err);
+              User.find({ where: { id: user.id } }, function(err, found) {
+                if (err) return done(err);
+                assert.equal(found.length, 0);
                 done();
               });
             });