diff --git a/Gemfile b/Gemfile
index b0cc80f..97650e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,6 @@ group :production do
 end
 
 group :test do
-  gem "machinist"
   gem "rspec"
   gem "sqlite3"
   gem "simplecov", :platforms => :ruby_19
diff --git a/Gemfile.lock b/Gemfile.lock
index 0aed641..be4a1e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,37 +2,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    daemons (1.1.4)
+    daemons (1.1.6)
     diff-lcs (1.1.3)
     eventmachine (0.12.10)
-    machinist (1.0.6)
     multi_json (1.0.4)
-    pg (0.12.0)
-      rake-compiler (~> 0.7)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+    pg (0.12.2)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rake-compiler (0.7.9)
-      rake
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    sequel (3.30.0)
+    rspec-mocks (2.8.0)
+    sequel (3.31.0)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     sqlite3 (1.3.5)
     thin (1.3.1)
@@ -48,7 +44,6 @@ PLATFORMS
 
 DEPENDENCIES
   SystemTimer
-  machinist
   pg
   rack-test
   rake
diff --git a/spec/blueprints.rb b/spec/blueprints.rb
deleted file mode 100644
index b7c5bac..0000000
--- a/spec/blueprints.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'acm/models/objects'
-
-Sham.define do
-  name          { |index| "name-#{index}" }
-  immutable_id  { SecureRandom.uuid }
-  random_number { rand(1000) }
-
-end
-
-module ACM::Models
-
-  PermissionSets.blueprint do
-    id            { Sham.random_number }
-    name          { "app_space_permission_set" }
-
-  end
-
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a1ae4a2..38c5539 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -43,11 +43,6 @@
 require "tmpdir"
 require "zlib"
 
-require "machinist/sequel"
-require "sham"
-require "blueprints"
-
-
 acm_dir = Dir.mktmpdir("acm_dir")
 acm_tmp_dir = Dir.mktmpdir("acm_tmp_dir")
 
@@ -76,6 +71,7 @@ def spec_asset(filename)
     ACM::Config.logger = logger
     ACM::Config.db = db
     ACM::Config.basic_auth = { :user => :admin.to_s, :password => :password.to_s }
+    ACM::Config.default_schema_version = "urn:acm:schemas:1.0"
 
     logger.info("Start test #{example.example.metadata[:full_description]}")
 
diff --git a/vendor/cache/daemons-1.1.4.gem b/vendor/cache/daemons-1.1.4.gem
deleted file mode 100644
index 958c542..0000000
Binary files a/vendor/cache/daemons-1.1.4.gem and /dev/null differ
diff --git a/vendor/cache/daemons-1.1.6.gem b/vendor/cache/daemons-1.1.6.gem
new file mode 100644
index 0000000..ccaadc7
Binary files /dev/null and b/vendor/cache/daemons-1.1.6.gem differ
diff --git a/vendor/cache/machinist-1.0.6.gem b/vendor/cache/machinist-1.0.6.gem
deleted file mode 100644
index 78915f2..0000000
Binary files a/vendor/cache/machinist-1.0.6.gem and /dev/null differ
diff --git a/vendor/cache/pg-0.12.0.gem b/vendor/cache/pg-0.12.0.gem
deleted file mode 100644
index 0d62381..0000000
Binary files a/vendor/cache/pg-0.12.0.gem and /dev/null differ
diff --git a/vendor/cache/pg-0.12.2.gem b/vendor/cache/pg-0.12.2.gem
new file mode 100644
index 0000000..e2f9534
Binary files /dev/null and b/vendor/cache/pg-0.12.2.gem differ
diff --git a/vendor/cache/rack-1.3.5.gem b/vendor/cache/rack-1.3.5.gem
deleted file mode 100644
index e8e2414..0000000
Binary files a/vendor/cache/rack-1.3.5.gem and /dev/null differ
diff --git a/vendor/cache/rack-1.4.1.gem b/vendor/cache/rack-1.4.1.gem
new file mode 100644
index 0000000..6ed5b80
Binary files /dev/null and b/vendor/cache/rack-1.4.1.gem differ
diff --git a/vendor/cache/rack-protection-1.1.4.gem b/vendor/cache/rack-protection-1.1.4.gem
deleted file mode 100644
index 2fdf241..0000000
Binary files a/vendor/cache/rack-protection-1.1.4.gem and /dev/null differ
diff --git a/vendor/cache/rack-protection-1.2.0.gem b/vendor/cache/rack-protection-1.2.0.gem
new file mode 100644
index 0000000..1368cef
Binary files /dev/null and b/vendor/cache/rack-protection-1.2.0.gem differ
diff --git a/vendor/cache/rake-compiler-0.7.9.gem b/vendor/cache/rake-compiler-0.7.9.gem
deleted file mode 100644
index ff196ea..0000000
Binary files a/vendor/cache/rake-compiler-0.7.9.gem and /dev/null differ
diff --git a/vendor/cache/rspec-2.7.0.gem b/vendor/cache/rspec-2.7.0.gem
deleted file mode 100644
index 4662539..0000000
Binary files a/vendor/cache/rspec-2.7.0.gem and /dev/null differ
diff --git a/vendor/cache/rspec-2.8.0.gem b/vendor/cache/rspec-2.8.0.gem
new file mode 100644
index 0000000..16caed4
Binary files /dev/null and b/vendor/cache/rspec-2.8.0.gem differ
diff --git a/vendor/cache/rspec-core-2.7.1.gem b/vendor/cache/rspec-core-2.7.1.gem
deleted file mode 100644
index 1587638..0000000
Binary files a/vendor/cache/rspec-core-2.7.1.gem and /dev/null differ
diff --git a/vendor/cache/rspec-core-2.8.0.gem b/vendor/cache/rspec-core-2.8.0.gem
new file mode 100644
index 0000000..6c8e7b5
Binary files /dev/null and b/vendor/cache/rspec-core-2.8.0.gem differ
diff --git a/vendor/cache/rspec-expectations-2.7.0.gem b/vendor/cache/rspec-expectations-2.7.0.gem
deleted file mode 100644
index ea49e50..0000000
Binary files a/vendor/cache/rspec-expectations-2.7.0.gem and /dev/null differ
diff --git a/vendor/cache/rspec-expectations-2.8.0.gem b/vendor/cache/rspec-expectations-2.8.0.gem
new file mode 100644
index 0000000..abfdf94
Binary files /dev/null and b/vendor/cache/rspec-expectations-2.8.0.gem differ
diff --git a/vendor/cache/rspec-mocks-2.7.0.gem b/vendor/cache/rspec-mocks-2.7.0.gem
deleted file mode 100644
index 9ba162c..0000000
Binary files a/vendor/cache/rspec-mocks-2.7.0.gem and /dev/null differ
diff --git a/vendor/cache/rspec-mocks-2.8.0.gem b/vendor/cache/rspec-mocks-2.8.0.gem
new file mode 100644
index 0000000..3d33d74
Binary files /dev/null and b/vendor/cache/rspec-mocks-2.8.0.gem differ
diff --git a/vendor/cache/sequel-3.30.0.gem b/vendor/cache/sequel-3.30.0.gem
deleted file mode 100644
index a83d57c..0000000
Binary files a/vendor/cache/sequel-3.30.0.gem and /dev/null differ
diff --git a/vendor/cache/sequel-3.31.0.gem b/vendor/cache/sequel-3.31.0.gem
new file mode 100644
index 0000000..a8e28ca
Binary files /dev/null and b/vendor/cache/sequel-3.31.0.gem differ
diff --git a/vendor/cache/sinatra-1.3.1.gem b/vendor/cache/sinatra-1.3.1.gem
deleted file mode 100644
index 6793407..0000000
Binary files a/vendor/cache/sinatra-1.3.1.gem and /dev/null differ
diff --git a/vendor/cache/sinatra-1.3.2.gem b/vendor/cache/sinatra-1.3.2.gem
new file mode 100644
index 0000000..a3d7b5a
Binary files /dev/null and b/vendor/cache/sinatra-1.3.2.gem differ