diff --git a/devops-service/config.rb b/devops-service/config.rb
index 5e1061c..5a42369 100644
--- a/devops-service/config.rb
+++ b/devops-service/config.rb
@@ -40,3 +40,4 @@ config[:static_ssh_key]   = "ssh_key" # or nil
 config[:static_certificate]   = "/path/to/.ssh/static.pem"
 
 config[:debug] = true
+config[:stub_classes] = true
\ No newline at end of file
diff --git a/devops-service/db/mongo/connectors/key.rb b/devops-service/db/mongo/connectors/key.rb
index 4b27347..7f28e8f 100644
--- a/devops-service/db/mongo/connectors/key.rb
+++ b/devops-service/db/mongo/connectors/key.rb
@@ -15,7 +15,7 @@ module Connectors
     end
 
     def key_delete id
-      delete(id, 'scope' => ::Key::USER)
+      delete(id, 'scope' => Devops::Model::Key::USER)
     end
 
     private
diff --git a/devops-service/lib/stubber.rb b/devops-service/lib/stubber.rb
index 8472125..82af032 100644
--- a/devops-service/lib/stubber.rb
+++ b/devops-service/lib/stubber.rb
@@ -4,6 +4,6 @@ module Stubber
   end
 
   def self.stub_models!
-    Dir["tests/stubs/models/*.rb"].each {|file| require file }
+    Dir["tests/stubs/models/stack/*.rb"].each {|file| require file }
   end
 end
diff --git a/devops-service/routes/v2.0/handlers/script.rb b/devops-service/routes/v2.0/handlers/script.rb
index 7b53e16..9887063 100644
--- a/devops-service/routes/v2.0/handlers/script.rb
+++ b/devops-service/routes/v2.0/handlers/script.rb
@@ -103,7 +103,7 @@ module Devops
           lambda {
             check_privileges("script", "w")
             file_name = params[:script_name]
-            file = File.join(DevopsService.config[:scripts_dir], check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
+            file = File.join(settings.scripts_dir, check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
             halt_response("File '#{file_name}' already exist") if File.exists?(file)
             File.open(file, "w") {|f| f.write(request.body.read)}
             create_response("File '#{params[:script_name]}' created", nil, 201)
@@ -114,7 +114,7 @@ module Devops
           lambda {
             check_privileges("script", "w")
             file_name = params[:script_name]
-            file = File.join(DevopsService.config[:scripts_dir], check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
+            file = File.join(settings.scripts_dir, check_filename(file_name, "Parameter 'script_name' must be a not empty string"))
             halt_response("File '#{file_name}' does not exist", 404) unless File.exists?(file)
             FileUtils.rm(file)
             create_response("File '#{params[:script_name]}' deleted")
diff --git a/devops-service/tests/stubs/models/stack/stack_openstack.rb b/devops-service/tests/stubs/models/stack/stack_openstack.rb
index 63cd4a5..8097da7 100644
--- a/devops-service/tests/stubs/models/stack/stack_openstack.rb
+++ b/devops-service/tests/stubs/models/stack/stack_openstack.rb
@@ -1,13 +1,17 @@
 puts '!!! WARNING: Some StackOpenstack methods are stubbed'
 
-class StackOpenstack < StackBase
-  def create_stack_in_cloud!
-    self.cloud_stack_id = '4c712026-dcd5-4664-90b8-0915494c1332'
+module Devops
+  module Model
+    class StackOpenstack < StackBase
+      def create_stack_in_cloud!
+        self.cloud_stack_id = '4c712026-dcd5-4664-90b8-0915494c1332'
+      end
+
+
+      def delete_stack_in_cloud!
+        true
+      end
+
+    end
   end
-
-
-  def delete_stack_in_cloud!
-    true
-  end
-
-end
+end
\ No newline at end of file
diff --git a/devops-service/tests/stubs/providers/openstack.rb b/devops-service/tests/stubs/providers/openstack.rb
index e0698f3..1414997 100644
--- a/devops-service/tests/stubs/providers/openstack.rb
+++ b/devops-service/tests/stubs/providers/openstack.rb
@@ -54,6 +54,11 @@ class Provider::Openstack
         'cidr' => '192.0.2.32/27',
         'name' => 'test_network',
         'id' => 'test_network_id'
+      },
+      {
+        'cidr' => '192.0.2.32/27',
+        'name' => 'private',
+        'id' => 'private_id'
       }
     ]
   end