diff --git a/tests/oar_properties_spec.rb b/spec/oar_properties_spec.rb
similarity index 99%
rename from tests/oar_properties_spec.rb
rename to spec/oar_properties_spec.rb
index bd766e41b258ba07079f9e2560f2ea9043e487ff..a1a75d3dd0a4502eb7c64b5bfed51e40eb648d7b 100644
--- a/tests/oar_properties_spec.rb
+++ b/spec/oar_properties_spec.rb
@@ -43,6 +43,7 @@ end
 stubbed_addresses = [
     "#{conf["uri"]}",
     "#{conf["uri"]}/oarapi/resources/details.json?limit=999999",
+    "#{conf["uri"]}stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999",
 ]
 
 
diff --git a/tests/spec_helper.rb b/spec/spec_helper.rb
similarity index 90%
rename from tests/spec_helper.rb
rename to spec/spec_helper.rb
index f0876afe7625af89fe0aaa188257361cffe41eb8..425ea3ea8e315ce8ee6e3bb5f3a17ddd0a939035 100644
--- a/tests/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -3,6 +3,7 @@ require 'simplecov'
 SimpleCov.start do
   add_filter '/tests/'
   add_filter '/bundle/'
+  add_filter '/spec/'
 end
 # This outputs the report to your public folder
 # You will want to add this to .gitignore
diff --git a/tests/stub_oar_properties/dump_oar_api_configured_server.json b/spec/stub_oar_properties/dump_oar_api_configured_server.json
similarity index 100%
rename from tests/stub_oar_properties/dump_oar_api_configured_server.json
rename to spec/stub_oar_properties/dump_oar_api_configured_server.json
diff --git a/tests/stub_oar_properties/dump_oar_api_configured_server_with_disk.json b/spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
similarity index 100%
rename from tests/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
rename to spec/stub_oar_properties/dump_oar_api_configured_server_with_disk.json
diff --git a/tests/stub_oar_properties/dump_oar_api_empty_server.json b/spec/stub_oar_properties/dump_oar_api_empty_server.json
similarity index 100%
rename from tests/stub_oar_properties/dump_oar_api_empty_server.json
rename to spec/stub_oar_properties/dump_oar_api_empty_server.json
diff --git a/tests/stub_oar_properties/load_data_hierarchy_stubbed_data.json b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
similarity index 100%
rename from tests/stub_oar_properties/load_data_hierarchy_stubbed_data.json
rename to spec/stub_oar_properties/load_data_hierarchy_stubbed_data.json
diff --git a/tests/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json b/spec/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json
similarity index 100%
rename from tests/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json
rename to spec/stub_oar_properties/load_data_hierarchy_stubbed_data_with_disk.json