diff --git a/.codeclimate.yml b/.codeclimate.yml
index dacdaff6f..ab70a0a2b 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -27,5 +27,5 @@ plugins:
 exclude_patterns:
   - "www/source/javascripts/"
   - "examples/"
-  - "test/unit/mock/profiles/"
-  - "test/kitchen"
\ No newline at end of file
+  - "test/fixtures/profiles/"
+  - "test/kitchen"
diff --git a/.rubocop.yml b/.rubocop.yml
index 0472edfb4..6c4051cff 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,8 +2,8 @@ AllCops:
   Exclude:
     - 'test/kitchen/**/*'
     - 'test/integration/**/controls/**/*.rb'
-    - 'test/unit/mock/profiles/**/*.rb'
-    - 'test/unit/mock/config_dirs/**/*.rb'
+    - 'test/fixtures/profiles/**/*.rb'
+    - 'test/fixtures/config_dirs/**/*.rb'
     - 'lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/**/*'
     - 'examples/**/controls/*.rb'
     - 'vendor/bundle/**/*'
diff --git a/Rakefile b/Rakefile
index 70ce7db01..8414a29d2 100755
--- a/Rakefile
+++ b/Rakefile
@@ -79,7 +79,7 @@ namespace :test do
 
     missing.reject! { |f| ! File.file? f }
     missing.reject! { |f| f =~ %r{test/(integration|cookbooks)} }
-    missing.reject! { |f| f =~ %r{test/unit/mock} }
+    missing.reject! { |f| f =~ %r{test/fixtures} }
     missing.reject! { |f| f =~ /test.*helper/ }
     missing.reject! { |f| f =~ %r{test/docker} }
 
@@ -207,7 +207,7 @@ namespace :test do
   task unit: [:accept_license]
 
   task :resources do
-    tests = Dir["test/unit/resource/*_test.rb"]
+    tests = Dir["test/unit/resources/*_test.rb"]
     return if tests.empty?
 
     sh(Gem.ruby, "test/docker_test.rb", *tests)
diff --git a/docs/dev/filtertable-internals.md b/docs/dev/filtertable-internals.md
index 8c4022481..9526c7d3b 100644
--- a/docs/dev/filtertable-internals.md
+++ b/docs/dev/filtertable-internals.md
@@ -12,7 +12,7 @@ Additionally, the ways in which the classes relate is not straightforward.
 
 The main FilterTable code is in [inspec/utils/filter.rb](https://github.com/chef/inspec/blob/master/lib/inspec/utils/filter.rb).
 
-Also educational is the unit test for Filtertable, at test/unit/utils/filter_table_test.rb .  Recent work has focused on using functional tests to exercise FilterTable; see test/unit/mocks/profiles/filter_table and test/functional/filter_table_test.rb .
+Also educational is the unit test for Filtertable, at test/unit/utils/filter_table_test.rb .  Recent work has focused on using functional tests to exercise FilterTable; see test/fixtures/profiles/filter_table and test/functional/filter_table_test.rb .
 
 The file inspec/utils/filter_array.rb appears to be unrelated.
 
diff --git a/docs/dev/plugins.md b/docs/dev/plugins.md
index deff31bd9..666db59d3 100644
--- a/docs/dev/plugins.md
+++ b/docs/dev/plugins.md
@@ -62,7 +62,7 @@ Putting this all together, here is a plugins.json file from the Chef InSpec test
     {
       "name": "inspec-meaning-of-life",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life"
+      "installation_path": "test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life"
     }
   ]
 }
diff --git a/examples/plugins/inspec-resource-lister/test/fixtures/README.md b/examples/plugins/inspec-resource-lister/test/fixtures/README.md
index 53930080e..9c9536aed 100644
--- a/examples/plugins/inspec-resource-lister/test/fixtures/README.md
+++ b/examples/plugins/inspec-resource-lister/test/fixtures/README.md
@@ -19,6 +19,6 @@ When writing your functional tests, you can point InSpec at the various test fix
 
 ## Using test fixtures provided with core inspec
 
-InSpec itself ships with many test fixtures - not just profiles, but attribute files, configuration directories, and more.  Examine them at [the fixtures directory](https://github.com/inspec/inspec/tree/master/test/unit/mock)
+InSpec itself ships with many test fixtures - not just profiles, but attribute files, configuration directories, and more.  Examine them at [the fixtures directory](https://github.com/inspec/inspec/tree/master/test/fixtures)
 
-To use them, see the helper.rb file included in the example at test/helper.rb .
\ No newline at end of file
+To use them, see the helper.rb file included in the example at test/helper.rb .
diff --git a/lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/fixtures/README.md b/lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/fixtures/README.md
index 0d21a41ee..088050c4b 100644
--- a/lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/fixtures/README.md
+++ b/lib/plugins/inspec-init/templates/plugins/inspec-plugin-template/test/fixtures/README.md
@@ -19,6 +19,6 @@ When writing your functional tests, you can point InSpec at the various test fix
 
 ## Using test fixtures provided with the `inspec` source code
 
-InSpec itself ships with many test fixtures - not just profiles, but attribute files, configuration directories, and more.  Examine them at [the fixtures directory](https://github.com/inspec/inspec/tree/master/test/unit/mock)
+InSpec itself ships with many test fixtures - not just profiles, but attribute files, configuration directories, and more.  Examine them at [the fixtures directory](https://github.com/inspec/inspec/tree/master/test/fixtures)
 
-To use them, see the helper.rb file included in the example at test/helper.rb .
\ No newline at end of file
+To use them, see the helper.rb file included in the example at test/helper.rb .
diff --git a/lib/plugins/inspec-plugin-manager-cli/test/functional/install_test.rb b/lib/plugins/inspec-plugin-manager-cli/test/functional/install_test.rb
index 633d85ea8..71325710c 100644
--- a/lib/plugins/inspec-plugin-manager-cli/test/functional/install_test.rb
+++ b/lib/plugins/inspec-plugin-manager-cli/test/functional/install_test.rb
@@ -29,7 +29,7 @@ class PluginManagerCliInstall < Minitest::Test
       resolved_path: File.join(core_config_dir_path, "test-fixture-1-float", "gems", ruby_abi_version, "gems", "inspec-test-fixture-0.1.0", "lib", "inspec-test-fixture.rb"),
     },
     "refers_to_a_relative_path" => {
-      given: File.join("test", "unit", "mock", "plugins", "inspec-test-fixture", "lib", "inspec-test-fixture.rb"),
+      given: File.join("test", "fixtures", "plugins", "inspec-test-fixture", "lib", "inspec-test-fixture.rb"),
     },
     "refers_to_a_train_plugin" => {
       given: File.join(core_config_dir_path, "train-test-fixture", "gems", ruby_abi_version, "gems", "train-test-fixture-0.1.0", "lib", "train-test-fixture.rb"),
diff --git a/lib/plugins/inspec-plugin-manager-cli/test/unit/plugin_def_test.rb b/lib/plugins/inspec-plugin-manager-cli/test/unit/plugin_def_test.rb
index 7a7a6dfa1..0ef4445eb 100644
--- a/lib/plugins/inspec-plugin-manager-cli/test/unit/plugin_def_test.rb
+++ b/lib/plugins/inspec-plugin-manager-cli/test/unit/plugin_def_test.rb
@@ -9,7 +9,7 @@ class PluginManagerCliDefinitionTests < Minitest::Test
   @@orig_home = Dir.home
 
   def setup
-    mock_path = File.expand_path "test/unit/mock"
+    mock_path = File.expand_path "test/fixtures"
 
     @config_dir_path = File.join(mock_path, "config_dirs")
     ENV["HOME"] = File.join(@config_dir_path, "fakehome")
diff --git a/lib/plugins/shared/core_plugin_test_helper.rb b/lib/plugins/shared/core_plugin_test_helper.rb
index e487b98a3..d99fb0d84 100644
--- a/lib/plugins/shared/core_plugin_test_helper.rb
+++ b/lib/plugins/shared/core_plugin_test_helper.rb
@@ -42,7 +42,7 @@ module CorePluginBaseHelper
   let(:repo_path) { File.expand_path(File.join(__FILE__, "..", "..", "..", "..")) }
   let(:inspec_path) { File.join(repo_path, "inspec-bin", "bin", "inspec") }
   let(:exec_inspec) { [Gem.ruby, "-I#{libdir}", inspec_path].join " " }
-  let(:core_mock_path) { File.join(repo_path, "test", "unit", "mock") }
+  let(:core_mock_path) { File.join(repo_path, "test", "fixtures") }
   let(:core_fixture_plugins_path) { File.join(core_mock_path, "plugins") }
   let(:core_config_dir_path) { File.join(core_mock_path, "config_dirs") }
 
diff --git a/support/rebuild_inspec_test_fixture_plugin.sh b/support/rebuild_inspec_test_fixture_plugin.sh
index 9ebb70866..00a67456a 100755
--- a/support/rebuild_inspec_test_fixture_plugin.sh
+++ b/support/rebuild_inspec_test_fixture_plugin.sh
@@ -5,8 +5,8 @@
 # 2. You are running from project root
 eval "$(rbenv init -)"
 
-PLUGIN_SRC_DIR=test/unit/mock/plugins/inspec-test-fixture
-FIXTURE_BASE=test/unit/mock/config_dirs
+PLUGIN_SRC_DIR=test/fixtures/plugins/inspec-test-fixture
+FIXTURE_BASE=test/fixtures/config_dirs
 FIXTURE_VERSIONS="1 2"
 
 # The format here is "<actual_version>,<abi_version> <another_version><<another_abi_version>""
@@ -44,4 +44,4 @@ for info in $RUBY_VERSIONS; do
   cp -v "$GEM_DIR/specifications/ordinal_array-0.2.0.gemspec" "$GEM_DIR/gems/ordinal_array-0.2.0/ordinal_array.gemspec"
 done
 
-rbenv shell 2.6.2
\ No newline at end of file
+rbenv shell 2.6.2
diff --git a/test/unit/mock/cmd/$env-PATH b/test/fixtures/cmd/$env-PATH
similarity index 100%
rename from test/unit/mock/cmd/$env-PATH
rename to test/fixtures/cmd/$env-PATH
diff --git a/test/unit/mock/cmd/$env-computername b/test/fixtures/cmd/$env-computername
similarity index 100%
rename from test/unit/mock/cmd/$env-computername
rename to test/fixtures/cmd/$env-computername
diff --git a/test/unit/mock/cmd/Get-NetAdapter b/test/fixtures/cmd/Get-NetAdapter
similarity index 100%
rename from test/unit/mock/cmd/Get-NetAdapter
rename to test/fixtures/cmd/Get-NetAdapter
diff --git a/test/unit/mock/cmd/Get-NetIPAddress b/test/fixtures/cmd/Get-NetIPAddress
similarity index 100%
rename from test/unit/mock/cmd/Get-NetIPAddress
rename to test/fixtures/cmd/Get-NetIPAddress
diff --git a/test/unit/mock/cmd/Resolve-DnsName b/test/fixtures/cmd/Resolve-DnsName
similarity index 100%
rename from test/unit/mock/cmd/Resolve-DnsName
rename to test/fixtures/cmd/Resolve-DnsName
diff --git a/test/unit/mock/cmd/Test-NetConnection b/test/fixtures/cmd/Test-NetConnection
similarity index 100%
rename from test/unit/mock/cmd/Test-NetConnection
rename to test/fixtures/cmd/Test-NetConnection
diff --git a/test/unit/mock/cmd/adsigroups b/test/fixtures/cmd/adsigroups
similarity index 100%
rename from test/unit/mock/cmd/adsigroups
rename to test/fixtures/cmd/adsigroups
diff --git a/test/unit/mock/cmd/adsiusers b/test/fixtures/cmd/adsiusers
similarity index 100%
rename from test/unit/mock/cmd/adsiusers
rename to test/fixtures/cmd/adsiusers
diff --git a/test/unit/mock/cmd/apk-info-grep-git b/test/fixtures/cmd/apk-info-grep-git
similarity index 100%
rename from test/unit/mock/cmd/apk-info-grep-git
rename to test/fixtures/cmd/apk-info-grep-git
diff --git a/test/unit/mock/cmd/auditctl b/test/fixtures/cmd/auditctl
similarity index 100%
rename from test/unit/mock/cmd/auditctl
rename to test/fixtures/cmd/auditctl
diff --git a/test/unit/mock/cmd/auditctl-legacy b/test/fixtures/cmd/auditctl-legacy
similarity index 100%
rename from test/unit/mock/cmd/auditctl-legacy
rename to test/fixtures/cmd/auditctl-legacy
diff --git a/test/unit/mock/cmd/auditctl-s b/test/fixtures/cmd/auditctl-s
similarity index 100%
rename from test/unit/mock/cmd/auditctl-s
rename to test/fixtures/cmd/auditctl-s
diff --git a/test/unit/mock/cmd/auditpol b/test/fixtures/cmd/auditpol
similarity index 100%
rename from test/unit/mock/cmd/auditpol
rename to test/fixtures/cmd/auditpol
diff --git a/test/unit/mock/cmd/bash -c type psql b/test/fixtures/cmd/bash -c type psql
similarity index 100%
rename from test/unit/mock/cmd/bash -c type psql
rename to test/fixtures/cmd/bash -c type psql
diff --git a/test/unit/mock/cmd/bash-c-type-curl b/test/fixtures/cmd/bash-c-type-curl
similarity index 100%
rename from test/unit/mock/cmd/bash-c-type-curl
rename to test/fixtures/cmd/bash-c-type-curl
diff --git a/test/unit/mock/cmd/bash-c-type-nginx b/test/fixtures/cmd/bash-c-type-nginx
similarity index 100%
rename from test/unit/mock/cmd/bash-c-type-nginx
rename to test/fixtures/cmd/bash-c-type-nginx
diff --git a/test/unit/mock/cmd/brew-info--json-v1-curl b/test/fixtures/cmd/brew-info--json-v1-curl
similarity index 100%
rename from test/unit/mock/cmd/brew-info--json-v1-curl
rename to test/fixtures/cmd/brew-info--json-v1-curl
diff --git a/test/unit/mock/cmd/brew-info--json-v1-nginx b/test/fixtures/cmd/brew-info--json-v1-nginx
similarity index 100%
rename from test/unit/mock/cmd/brew-info--json-v1-nginx
rename to test/fixtures/cmd/brew-info--json-v1-nginx
diff --git a/test/unit/mock/cmd/brew-info-jq b/test/fixtures/cmd/brew-info-jq
similarity index 100%
rename from test/unit/mock/cmd/brew-info-jq
rename to test/fixtures/cmd/brew-info-jq
diff --git a/test/unit/mock/cmd/chage-l-root b/test/fixtures/cmd/chage-l-root
similarity index 100%
rename from test/unit/mock/cmd/chage-l-root
rename to test/fixtures/cmd/chage-l-root
diff --git a/test/unit/mock/cmd/choco-list-nssm b/test/fixtures/cmd/choco-list-nssm
similarity index 100%
rename from test/unit/mock/cmd/choco-list-nssm
rename to test/fixtures/cmd/choco-list-nssm
diff --git a/test/unit/mock/cmd/crontab-foouser b/test/fixtures/cmd/crontab-foouser
similarity index 100%
rename from test/unit/mock/cmd/crontab-foouser
rename to test/fixtures/cmd/crontab-foouser
diff --git a/test/unit/mock/cmd/crontab-root b/test/fixtures/cmd/crontab-root
similarity index 100%
rename from test/unit/mock/cmd/crontab-root
rename to test/fixtures/cmd/crontab-root
diff --git a/test/unit/mock/cmd/crontab-special b/test/fixtures/cmd/crontab-special
similarity index 100%
rename from test/unit/mock/cmd/crontab-special
rename to test/fixtures/cmd/crontab-special
diff --git a/test/unit/mock/cmd/df-PT b/test/fixtures/cmd/df-PT
similarity index 100%
rename from test/unit/mock/cmd/df-PT
rename to test/fixtures/cmd/df-PT
diff --git a/test/unit/mock/cmd/dig-A-example.com b/test/fixtures/cmd/dig-A-example.com
similarity index 100%
rename from test/unit/mock/cmd/dig-A-example.com
rename to test/fixtures/cmd/dig-A-example.com
diff --git a/test/unit/mock/cmd/dig-AAAA-example.com b/test/fixtures/cmd/dig-AAAA-example.com
similarity index 100%
rename from test/unit/mock/cmd/dig-AAAA-example.com
rename to test/fixtures/cmd/dig-AAAA-example.com
diff --git a/test/unit/mock/cmd/dism-iis-webserver b/test/fixtures/cmd/dism-iis-webserver
similarity index 100%
rename from test/unit/mock/cmd/dism-iis-webserver
rename to test/fixtures/cmd/dism-iis-webserver
diff --git a/test/unit/mock/cmd/docker-images b/test/fixtures/cmd/docker-images
similarity index 100%
rename from test/unit/mock/cmd/docker-images
rename to test/fixtures/cmd/docker-images
diff --git a/test/unit/mock/cmd/docker-info b/test/fixtures/cmd/docker-info
similarity index 100%
rename from test/unit/mock/cmd/docker-info
rename to test/fixtures/cmd/docker-info
diff --git a/test/unit/mock/cmd/docker-inspec b/test/fixtures/cmd/docker-inspec
similarity index 100%
rename from test/unit/mock/cmd/docker-inspec
rename to test/fixtures/cmd/docker-inspec
diff --git a/test/unit/mock/cmd/docker-plugin-ls b/test/fixtures/cmd/docker-plugin-ls
similarity index 100%
rename from test/unit/mock/cmd/docker-plugin-ls
rename to test/fixtures/cmd/docker-plugin-ls
diff --git a/test/unit/mock/cmd/docker-ps-a b/test/fixtures/cmd/docker-ps-a
similarity index 100%
rename from test/unit/mock/cmd/docker-ps-a
rename to test/fixtures/cmd/docker-ps-a
diff --git a/test/unit/mock/cmd/docker-service-ls b/test/fixtures/cmd/docker-service-ls
similarity index 100%
rename from test/unit/mock/cmd/docker-service-ls
rename to test/fixtures/cmd/docker-service-ls
diff --git a/test/unit/mock/cmd/docker-version b/test/fixtures/cmd/docker-version
similarity index 100%
rename from test/unit/mock/cmd/docker-version
rename to test/fixtures/cmd/docker-version
diff --git a/test/unit/mock/cmd/dpkg-query-W b/test/fixtures/cmd/dpkg-query-W
similarity index 100%
rename from test/unit/mock/cmd/dpkg-query-W
rename to test/fixtures/cmd/dpkg-query-W
diff --git a/test/unit/mock/cmd/dpkg-s-curl b/test/fixtures/cmd/dpkg-s-curl
similarity index 100%
rename from test/unit/mock/cmd/dpkg-s-curl
rename to test/fixtures/cmd/dpkg-s-curl
diff --git a/test/unit/mock/cmd/dpkg-s-held-package b/test/fixtures/cmd/dpkg-s-held-package
similarity index 100%
rename from test/unit/mock/cmd/dpkg-s-held-package
rename to test/fixtures/cmd/dpkg-s-held-package
diff --git a/test/unit/mock/cmd/dscacheutil-query-group b/test/fixtures/cmd/dscacheutil-query-group
similarity index 100%
rename from test/unit/mock/cmd/dscacheutil-query-group
rename to test/fixtures/cmd/dscacheutil-query-group
diff --git a/test/unit/mock/cmd/dscl b/test/fixtures/cmd/dscl
similarity index 100%
rename from test/unit/mock/cmd/dscl
rename to test/fixtures/cmd/dscl
diff --git a/test/unit/mock/cmd/elasticsearch-cluster-auth b/test/fixtures/cmd/elasticsearch-cluster-auth
similarity index 100%
rename from test/unit/mock/cmd/elasticsearch-cluster-auth
rename to test/fixtures/cmd/elasticsearch-cluster-auth
diff --git a/test/unit/mock/cmd/elasticsearch-cluster-no-ssl b/test/fixtures/cmd/elasticsearch-cluster-no-ssl
similarity index 100%
rename from test/unit/mock/cmd/elasticsearch-cluster-no-ssl
rename to test/fixtures/cmd/elasticsearch-cluster-no-ssl
diff --git a/test/unit/mock/cmd/elasticsearch-cluster-nodes-default b/test/fixtures/cmd/elasticsearch-cluster-nodes-default
similarity index 100%
rename from test/unit/mock/cmd/elasticsearch-cluster-nodes-default
rename to test/fixtures/cmd/elasticsearch-cluster-nodes-default
diff --git a/test/unit/mock/cmd/elasticsearch-cluster-url b/test/fixtures/cmd/elasticsearch-cluster-url
similarity index 100%
rename from test/unit/mock/cmd/elasticsearch-cluster-url
rename to test/fixtures/cmd/elasticsearch-cluster-url
diff --git a/test/unit/mock/cmd/env b/test/fixtures/cmd/env
similarity index 100%
rename from test/unit/mock/cmd/env
rename to test/fixtures/cmd/env
diff --git a/test/unit/mock/cmd/etc-apt b/test/fixtures/cmd/etc-apt
similarity index 100%
rename from test/unit/mock/cmd/etc-apt
rename to test/fixtures/cmd/etc-apt
diff --git a/test/unit/mock/cmd/find-apache2-conf-enabled b/test/fixtures/cmd/find-apache2-conf-enabled
similarity index 100%
rename from test/unit/mock/cmd/find-apache2-conf-enabled
rename to test/fixtures/cmd/find-apache2-conf-enabled
diff --git a/test/unit/mock/cmd/find-apache2-conf-enabled-link b/test/fixtures/cmd/find-apache2-conf-enabled-link
similarity index 100%
rename from test/unit/mock/cmd/find-apache2-conf-enabled-link
rename to test/fixtures/cmd/find-apache2-conf-enabled-link
diff --git a/test/unit/mock/cmd/find-apache2-ports-conf b/test/fixtures/cmd/find-apache2-ports-conf
similarity index 100%
rename from test/unit/mock/cmd/find-apache2-ports-conf
rename to test/fixtures/cmd/find-apache2-ports-conf
diff --git a/test/unit/mock/cmd/find-etc-rc-d-name-S b/test/fixtures/cmd/find-etc-rc-d-name-S
similarity index 100%
rename from test/unit/mock/cmd/find-etc-rc-d-name-S
rename to test/fixtures/cmd/find-etc-rc-d-name-S
diff --git a/test/unit/mock/cmd/find-httpd-conf-enabled-link b/test/fixtures/cmd/find-httpd-conf-enabled-link
similarity index 100%
rename from test/unit/mock/cmd/find-httpd-conf-enabled-link
rename to test/fixtures/cmd/find-httpd-conf-enabled-link
diff --git a/test/unit/mock/cmd/find-httpd-ssl-conf b/test/fixtures/cmd/find-httpd-ssl-conf
similarity index 100%
rename from test/unit/mock/cmd/find-httpd-ssl-conf
rename to test/fixtures/cmd/find-httpd-ssl-conf
diff --git a/test/unit/mock/cmd/find-httpd-status-conf b/test/fixtures/cmd/find-httpd-status-conf
similarity index 100%
rename from test/unit/mock/cmd/find-httpd-status-conf
rename to test/fixtures/cmd/find-httpd-status-conf
diff --git a/test/unit/mock/cmd/find-net-interface b/test/fixtures/cmd/find-net-interface
similarity index 100%
rename from test/unit/mock/cmd/find-net-interface
rename to test/fixtures/cmd/find-net-interface
diff --git a/test/unit/mock/cmd/find-nginx-conf b/test/fixtures/cmd/find-nginx-conf
similarity index 100%
rename from test/unit/mock/cmd/find-nginx-conf
rename to test/fixtures/cmd/find-nginx-conf
diff --git a/test/unit/mock/cmd/find-nginx-confd-multiple-conf b/test/fixtures/cmd/find-nginx-confd-multiple-conf
similarity index 100%
rename from test/unit/mock/cmd/find-nginx-confd-multiple-conf
rename to test/fixtures/cmd/find-nginx-confd-multiple-conf
diff --git a/test/unit/mock/cmd/find-nginx-mime-types b/test/fixtures/cmd/find-nginx-mime-types
similarity index 100%
rename from test/unit/mock/cmd/find-nginx-mime-types
rename to test/fixtures/cmd/find-nginx-mime-types
diff --git a/test/unit/mock/cmd/find-nginx-proxy-conf b/test/fixtures/cmd/find-nginx-proxy-conf
similarity index 100%
rename from test/unit/mock/cmd/find-nginx-proxy-conf
rename to test/fixtures/cmd/find-nginx-proxy-conf
diff --git a/test/unit/mock/cmd/find-nginx-quotesd-example-conf b/test/fixtures/cmd/find-nginx-quotesd-example-conf
similarity index 100%
rename from test/unit/mock/cmd/find-nginx-quotesd-example-conf
rename to test/fixtures/cmd/find-nginx-quotesd-example-conf
diff --git a/test/unit/mock/cmd/find-xinetd.d b/test/fixtures/cmd/find-xinetd.d
similarity index 100%
rename from test/unit/mock/cmd/find-xinetd.d
rename to test/fixtures/cmd/find-xinetd.d
diff --git a/test/unit/mock/cmd/firewall-cmd b/test/fixtures/cmd/firewall-cmd
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd
rename to test/fixtures/cmd/firewall-cmd
diff --git a/test/unit/mock/cmd/firewall-cmd--get-active-zones b/test/fixtures/cmd/firewall-cmd--get-active-zones
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd--get-active-zones
rename to test/fixtures/cmd/firewall-cmd--get-active-zones
diff --git a/test/unit/mock/cmd/firewall-cmd--get-default-zone b/test/fixtures/cmd/firewall-cmd--get-default-zone
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd--get-default-zone
rename to test/fixtures/cmd/firewall-cmd--get-default-zone
diff --git a/test/unit/mock/cmd/firewall-cmd--get-zones b/test/fixtures/cmd/firewall-cmd--get-zones
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd--get-zones
rename to test/fixtures/cmd/firewall-cmd--get-zones
diff --git a/test/unit/mock/cmd/firewall-cmd--service-enabled-in-zone b/test/fixtures/cmd/firewall-cmd--service-enabled-in-zone
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd--service-enabled-in-zone
rename to test/fixtures/cmd/firewall-cmd--service-enabled-in-zone
diff --git a/test/unit/mock/cmd/firewall-cmd--state b/test/fixtures/cmd/firewall-cmd--state
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd--state
rename to test/fixtures/cmd/firewall-cmd--state
diff --git a/test/unit/mock/cmd/firewall-cmd-has-port-enabled-in-zone b/test/fixtures/cmd/firewall-cmd-has-port-enabled-in-zone
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd-has-port-enabled-in-zone
rename to test/fixtures/cmd/firewall-cmd-has-port-enabled-in-zone
diff --git a/test/unit/mock/cmd/firewall-cmd-has-rule-enabled b/test/fixtures/cmd/firewall-cmd-has-rule-enabled
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd-has-rule-enabled
rename to test/fixtures/cmd/firewall-cmd-has-rule-enabled
diff --git a/test/unit/mock/cmd/firewall-cmd-service-ports-enabled-in-zone b/test/fixtures/cmd/firewall-cmd-service-ports-enabled-in-zone
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd-service-ports-enabled-in-zone
rename to test/fixtures/cmd/firewall-cmd-service-ports-enabled-in-zone
diff --git a/test/unit/mock/cmd/firewall-cmd-service-protocols-enabled-in-zone b/test/fixtures/cmd/firewall-cmd-service-protocols-enabled-in-zone
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd-service-protocols-enabled-in-zone
rename to test/fixtures/cmd/firewall-cmd-service-protocols-enabled-in-zone
diff --git a/test/unit/mock/cmd/firewall-cmd-services-bound b/test/fixtures/cmd/firewall-cmd-services-bound
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd-services-bound
rename to test/fixtures/cmd/firewall-cmd-services-bound
diff --git a/test/unit/mock/cmd/firewall-cmd-sources-bound b/test/fixtures/cmd/firewall-cmd-sources-bound
similarity index 100%
rename from test/unit/mock/cmd/firewall-cmd-sources-bound
rename to test/fixtures/cmd/firewall-cmd-sources-bound
diff --git a/test/unit/mock/cmd/gem-list-local-a-q-chef-sugar b/test/fixtures/cmd/gem-list-local-a-q-chef-sugar
similarity index 100%
rename from test/unit/mock/cmd/gem-list-local-a-q-chef-sugar
rename to test/fixtures/cmd/gem-list-local-a-q-chef-sugar
diff --git a/test/unit/mock/cmd/gem-list-local-a-q-json b/test/fixtures/cmd/gem-list-local-a-q-json
similarity index 100%
rename from test/unit/mock/cmd/gem-list-local-a-q-json
rename to test/fixtures/cmd/gem-list-local-a-q-json
diff --git a/test/unit/mock/cmd/gem-list-local-a-q-knife-backup b/test/fixtures/cmd/gem-list-local-a-q-knife-backup
similarity index 100%
rename from test/unit/mock/cmd/gem-list-local-a-q-knife-backup
rename to test/fixtures/cmd/gem-list-local-a-q-knife-backup
diff --git a/test/unit/mock/cmd/gem-list-local-a-q-not-installed b/test/fixtures/cmd/gem-list-local-a-q-not-installed
similarity index 100%
rename from test/unit/mock/cmd/gem-list-local-a-q-not-installed
rename to test/fixtures/cmd/gem-list-local-a-q-not-installed
diff --git a/test/unit/mock/cmd/gem-list-local-a-q-pry b/test/fixtures/cmd/gem-list-local-a-q-pry
similarity index 100%
rename from test/unit/mock/cmd/gem-list-local-a-q-pry
rename to test/fixtures/cmd/gem-list-local-a-q-pry
diff --git a/test/unit/mock/cmd/gem-list-local-a-q-rubocop b/test/fixtures/cmd/gem-list-local-a-q-rubocop
similarity index 100%
rename from test/unit/mock/cmd/gem-list-local-a-q-rubocop
rename to test/fixtures/cmd/gem-list-local-a-q-rubocop
diff --git a/test/unit/mock/cmd/get-item-property-package b/test/fixtures/cmd/get-item-property-package
similarity index 100%
rename from test/unit/mock/cmd/get-item-property-package
rename to test/fixtures/cmd/get-item-property-package
diff --git a/test/unit/mock/cmd/get-net-tcpconnection b/test/fixtures/cmd/get-net-tcpconnection
similarity index 100%
rename from test/unit/mock/cmd/get-net-tcpconnection
rename to test/fixtures/cmd/get-net-tcpconnection
diff --git a/test/unit/mock/cmd/get-netadapter-binding-bridge b/test/fixtures/cmd/get-netadapter-binding-bridge
similarity index 100%
rename from test/unit/mock/cmd/get-netadapter-binding-bridge
rename to test/fixtures/cmd/get-netadapter-binding-bridge
diff --git a/test/unit/mock/cmd/get-package-firefox b/test/fixtures/cmd/get-package-firefox
similarity index 100%
rename from test/unit/mock/cmd/get-package-firefox
rename to test/fixtures/cmd/get-package-firefox
diff --git a/test/unit/mock/cmd/get-package-ruby b/test/fixtures/cmd/get-package-ruby
similarity index 100%
rename from test/unit/mock/cmd/get-package-ruby
rename to test/fixtures/cmd/get-package-ruby
diff --git a/test/unit/mock/cmd/get-process_processes b/test/fixtures/cmd/get-process_processes
similarity index 100%
rename from test/unit/mock/cmd/get-process_processes
rename to test/fixtures/cmd/get-process_processes
diff --git a/test/unit/mock/cmd/get-service-dhcp b/test/fixtures/cmd/get-service-dhcp
similarity index 100%
rename from test/unit/mock/cmd/get-service-dhcp
rename to test/fixtures/cmd/get-service-dhcp
diff --git a/test/unit/mock/cmd/get-windows-feature b/test/fixtures/cmd/get-windows-feature
similarity index 100%
rename from test/unit/mock/cmd/get-windows-feature
rename to test/fixtures/cmd/get-windows-feature
diff --git a/test/unit/mock/cmd/get-windows-feature-iis-webserver b/test/fixtures/cmd/get-windows-feature-iis-webserver
similarity index 100%
rename from test/unit/mock/cmd/get-windows-feature-iis-webserver
rename to test/fixtures/cmd/get-windows-feature-iis-webserver
diff --git a/test/unit/mock/cmd/get-windows-pip-package b/test/fixtures/cmd/get-windows-pip-package
similarity index 100%
rename from test/unit/mock/cmd/get-windows-pip-package
rename to test/fixtures/cmd/get-windows-pip-package
diff --git a/test/unit/mock/cmd/get-wmiobject b/test/fixtures/cmd/get-wmiobject
similarity index 100%
rename from test/unit/mock/cmd/get-wmiobject
rename to test/fixtures/cmd/get-wmiobject
diff --git a/test/unit/mock/cmd/get-wmiobject-filesystem b/test/fixtures/cmd/get-wmiobject-filesystem
similarity index 100%
rename from test/unit/mock/cmd/get-wmiobject-filesystem
rename to test/fixtures/cmd/get-wmiobject-filesystem
diff --git a/test/unit/mock/cmd/getent-ahosts-example.com b/test/fixtures/cmd/getent-ahosts-example.com
similarity index 100%
rename from test/unit/mock/cmd/getent-ahosts-example.com
rename to test/fixtures/cmd/getent-ahosts-example.com
diff --git a/test/unit/mock/cmd/getent-passwd-jfolmer b/test/fixtures/cmd/getent-passwd-jfolmer
similarity index 100%
rename from test/unit/mock/cmd/getent-passwd-jfolmer
rename to test/fixtures/cmd/getent-passwd-jfolmer
diff --git a/test/unit/mock/cmd/getent-passwd-root b/test/fixtures/cmd/getent-passwd-root
similarity index 100%
rename from test/unit/mock/cmd/getent-passwd-root
rename to test/fixtures/cmd/getent-passwd-root
diff --git a/test/unit/mock/cmd/host-AAAA-example.com b/test/fixtures/cmd/host-AAAA-example.com
similarity index 100%
rename from test/unit/mock/cmd/host-AAAA-example.com
rename to test/fixtures/cmd/host-AAAA-example.com
diff --git a/test/unit/mock/cmd/hostname b/test/fixtures/cmd/hostname
similarity index 100%
rename from test/unit/mock/cmd/hostname
rename to test/fixtures/cmd/hostname
diff --git a/test/unit/mock/cmd/hpux-netstat-inet b/test/fixtures/cmd/hpux-netstat-inet
similarity index 100%
rename from test/unit/mock/cmd/hpux-netstat-inet
rename to test/fixtures/cmd/hpux-netstat-inet
diff --git a/test/unit/mock/cmd/hpux-netstat-inet6 b/test/fixtures/cmd/hpux-netstat-inet6
similarity index 100%
rename from test/unit/mock/cmd/hpux-netstat-inet6
rename to test/fixtures/cmd/hpux-netstat-inet6
diff --git a/test/unit/mock/cmd/http-remote-basic-auth b/test/fixtures/cmd/http-remote-basic-auth
similarity index 100%
rename from test/unit/mock/cmd/http-remote-basic-auth
rename to test/fixtures/cmd/http-remote-basic-auth
diff --git a/test/unit/mock/cmd/http-remote-head-request b/test/fixtures/cmd/http-remote-head-request
similarity index 100%
rename from test/unit/mock/cmd/http-remote-head-request
rename to test/fixtures/cmd/http-remote-head-request
diff --git a/test/unit/mock/cmd/http-remote-headers b/test/fixtures/cmd/http-remote-headers
similarity index 100%
rename from test/unit/mock/cmd/http-remote-headers
rename to test/fixtures/cmd/http-remote-headers
diff --git a/test/unit/mock/cmd/http-remote-max-redirs b/test/fixtures/cmd/http-remote-max-redirs
similarity index 100%
rename from test/unit/mock/cmd/http-remote-max-redirs
rename to test/fixtures/cmd/http-remote-max-redirs
diff --git a/test/unit/mock/cmd/http-remote-no-options b/test/fixtures/cmd/http-remote-no-options
similarity index 100%
rename from test/unit/mock/cmd/http-remote-no-options
rename to test/fixtures/cmd/http-remote-no-options
diff --git a/test/unit/mock/cmd/http-remote-options-request b/test/fixtures/cmd/http-remote-options-request
similarity index 100%
rename from test/unit/mock/cmd/http-remote-options-request
rename to test/fixtures/cmd/http-remote-options-request
diff --git a/test/unit/mock/cmd/http-remote-params b/test/fixtures/cmd/http-remote-params
similarity index 100%
rename from test/unit/mock/cmd/http-remote-params
rename to test/fixtures/cmd/http-remote-params
diff --git a/test/unit/mock/cmd/http-remote-post b/test/fixtures/cmd/http-remote-post
similarity index 100%
rename from test/unit/mock/cmd/http-remote-post
rename to test/fixtures/cmd/http-remote-post
diff --git a/test/unit/mock/cmd/id-chartmann b/test/fixtures/cmd/id-chartmann
similarity index 100%
rename from test/unit/mock/cmd/id-chartmann
rename to test/fixtures/cmd/id-chartmann
diff --git a/test/unit/mock/cmd/id-jfolmer b/test/fixtures/cmd/id-jfolmer
similarity index 100%
rename from test/unit/mock/cmd/id-jfolmer
rename to test/fixtures/cmd/id-jfolmer
diff --git a/test/unit/mock/cmd/id-root b/test/fixtures/cmd/id-root
similarity index 100%
rename from test/unit/mock/cmd/id-root
rename to test/fixtures/cmd/id-root
diff --git a/test/unit/mock/cmd/iis-default-app-pool b/test/fixtures/cmd/iis-default-app-pool
similarity index 100%
rename from test/unit/mock/cmd/iis-default-app-pool
rename to test/fixtures/cmd/iis-default-app-pool
diff --git a/test/unit/mock/cmd/iis-default-web-site b/test/fixtures/cmd/iis-default-web-site
similarity index 100%
rename from test/unit/mock/cmd/iis-default-web-site
rename to test/fixtures/cmd/iis-default-web-site
diff --git a/test/unit/mock/cmd/initctl--version b/test/fixtures/cmd/initctl--version
similarity index 100%
rename from test/unit/mock/cmd/initctl--version
rename to test/fixtures/cmd/initctl--version
diff --git a/test/unit/mock/cmd/initctl-status-ssh b/test/fixtures/cmd/initctl-status-ssh
similarity index 100%
rename from test/unit/mock/cmd/initctl-status-ssh
rename to test/fixtures/cmd/initctl-status-ssh
diff --git a/test/unit/mock/cmd/interface-addresses-4 b/test/fixtures/cmd/interface-addresses-4
similarity index 100%
rename from test/unit/mock/cmd/interface-addresses-4
rename to test/fixtures/cmd/interface-addresses-4
diff --git a/test/unit/mock/cmd/interface-addresses-6 b/test/fixtures/cmd/interface-addresses-6
similarity index 100%
rename from test/unit/mock/cmd/interface-addresses-6
rename to test/fixtures/cmd/interface-addresses-6
diff --git a/test/unit/mock/cmd/ip6tables-s b/test/fixtures/cmd/ip6tables-s
similarity index 100%
rename from test/unit/mock/cmd/ip6tables-s
rename to test/fixtures/cmd/ip6tables-s
diff --git a/test/unit/mock/cmd/iptables-s b/test/fixtures/cmd/iptables-s
similarity index 100%
rename from test/unit/mock/cmd/iptables-s
rename to test/fixtures/cmd/iptables-s
diff --git a/test/unit/mock/cmd/kb4019215 b/test/fixtures/cmd/kb4019215
similarity index 100%
rename from test/unit/mock/cmd/kb4019215
rename to test/fixtures/cmd/kb4019215
diff --git a/test/unit/mock/cmd/launchctl-list b/test/fixtures/cmd/launchctl-list
similarity index 100%
rename from test/unit/mock/cmd/launchctl-list
rename to test/fixtures/cmd/launchctl-list
diff --git a/test/unit/mock/cmd/logins-x b/test/fixtures/cmd/logins-x
similarity index 100%
rename from test/unit/mock/cmd/logins-x
rename to test/fixtures/cmd/logins-x
diff --git a/test/unit/mock/cmd/ls-1-etc-init.d b/test/fixtures/cmd/ls-1-etc-init.d
similarity index 100%
rename from test/unit/mock/cmd/ls-1-etc-init.d
rename to test/fixtures/cmd/ls-1-etc-init.d
diff --git a/test/unit/mock/cmd/ls-sys-class-net-br b/test/fixtures/cmd/ls-sys-class-net-br
similarity index 100%
rename from test/unit/mock/cmd/ls-sys-class-net-br
rename to test/fixtures/cmd/ls-sys-class-net-br
diff --git a/test/unit/mock/cmd/lsmod b/test/fixtures/cmd/lsmod
similarity index 100%
rename from test/unit/mock/cmd/lsmod
rename to test/fixtures/cmd/lsmod
diff --git a/test/unit/mock/cmd/lsof-nP-i-FpctPn b/test/fixtures/cmd/lsof-nP-i-FpctPn
similarity index 100%
rename from test/unit/mock/cmd/lsof-nP-i-FpctPn
rename to test/fixtures/cmd/lsof-nP-i-FpctPn
diff --git a/test/unit/mock/cmd/manufacturer b/test/fixtures/cmd/manufacturer
similarity index 100%
rename from test/unit/mock/cmd/manufacturer
rename to test/fixtures/cmd/manufacturer
diff --git a/test/unit/mock/cmd/model b/test/fixtures/cmd/model
similarity index 100%
rename from test/unit/mock/cmd/model
rename to test/fixtures/cmd/model
diff --git a/test/unit/mock/cmd/model_darwin b/test/fixtures/cmd/model_darwin
similarity index 100%
rename from test/unit/mock/cmd/model_darwin
rename to test/fixtures/cmd/model_darwin
diff --git a/test/unit/mock/cmd/modinfo-f-version-dhcp b/test/fixtures/cmd/modinfo-f-version-dhcp
similarity index 100%
rename from test/unit/mock/cmd/modinfo-f-version-dhcp
rename to test/fixtures/cmd/modinfo-f-version-dhcp
diff --git a/test/unit/mock/cmd/modprobe-config b/test/fixtures/cmd/modprobe-config
similarity index 100%
rename from test/unit/mock/cmd/modprobe-config
rename to test/fixtures/cmd/modprobe-config
diff --git a/test/unit/mock/cmd/mount b/test/fixtures/cmd/mount
similarity index 100%
rename from test/unit/mock/cmd/mount
rename to test/fixtures/cmd/mount
diff --git a/test/unit/mock/cmd/mount-multiple b/test/fixtures/cmd/mount-multiple
similarity index 100%
rename from test/unit/mock/cmd/mount-multiple
rename to test/fixtures/cmd/mount-multiple
diff --git a/test/unit/mock/cmd/mount-whitespaces b/test/fixtures/cmd/mount-whitespaces
similarity index 100%
rename from test/unit/mock/cmd/mount-whitespaces
rename to test/fixtures/cmd/mount-whitespaces
diff --git a/test/unit/mock/cmd/mssql-getdate b/test/fixtures/cmd/mssql-getdate
similarity index 100%
rename from test/unit/mock/cmd/mssql-getdate
rename to test/fixtures/cmd/mssql-getdate
diff --git a/test/unit/mock/cmd/mssql-result b/test/fixtures/cmd/mssql-result
similarity index 100%
rename from test/unit/mock/cmd/mssql-result
rename to test/fixtures/cmd/mssql-result
diff --git a/test/unit/mock/cmd/mssql-sqlcmd b/test/fixtures/cmd/mssql-sqlcmd
similarity index 100%
rename from test/unit/mock/cmd/mssql-sqlcmd
rename to test/fixtures/cmd/mssql-sqlcmd
diff --git a/test/unit/mock/cmd/netstat-aan b/test/fixtures/cmd/netstat-aan
similarity index 100%
rename from test/unit/mock/cmd/netstat-aan
rename to test/fixtures/cmd/netstat-aan
diff --git a/test/unit/mock/cmd/netstat-anbo-pipe-select-string-pattern.utf8 b/test/fixtures/cmd/netstat-anbo-pipe-select-string-pattern.utf8
similarity index 100%
rename from test/unit/mock/cmd/netstat-anbo-pipe-select-string-pattern.utf8
rename to test/fixtures/cmd/netstat-anbo-pipe-select-string-pattern.utf8
diff --git a/test/unit/mock/cmd/netstat-tulpen b/test/fixtures/cmd/netstat-tulpen
similarity index 100%
rename from test/unit/mock/cmd/netstat-tulpen
rename to test/fixtures/cmd/netstat-tulpen
diff --git a/test/unit/mock/cmd/netstat-tulpen-busybox b/test/fixtures/cmd/netstat-tulpen-busybox
similarity index 100%
rename from test/unit/mock/cmd/netstat-tulpen-busybox
rename to test/fixtures/cmd/netstat-tulpen-busybox
diff --git a/test/unit/mock/cmd/nginx-v b/test/fixtures/cmd/nginx-v
similarity index 100%
rename from test/unit/mock/cmd/nginx-v
rename to test/fixtures/cmd/nginx-v
diff --git a/test/unit/mock/cmd/npm-g-ls--json-bower b/test/fixtures/cmd/npm-g-ls--json-bower
similarity index 100%
rename from test/unit/mock/cmd/npm-g-ls--json-bower
rename to test/fixtures/cmd/npm-g-ls--json-bower
diff --git a/test/unit/mock/cmd/npm-ls--json-bower b/test/fixtures/cmd/npm-ls--json-bower
similarity index 100%
rename from test/unit/mock/cmd/npm-ls--json-bower
rename to test/fixtures/cmd/npm-ls--json-bower
diff --git a/test/unit/mock/cmd/oracle-cmd b/test/fixtures/cmd/oracle-cmd
similarity index 100%
rename from test/unit/mock/cmd/oracle-cmd
rename to test/fixtures/cmd/oracle-cmd
diff --git a/test/unit/mock/cmd/oracle-result b/test/fixtures/cmd/oracle-result
similarity index 100%
rename from test/unit/mock/cmd/oracle-result
rename to test/fixtures/cmd/oracle-result
diff --git a/test/unit/mock/cmd/pacman-qi-curl b/test/fixtures/cmd/pacman-qi-curl
similarity index 100%
rename from test/unit/mock/cmd/pacman-qi-curl
rename to test/fixtures/cmd/pacman-qi-curl
diff --git a/test/unit/mock/cmd/perl-print-version b/test/fixtures/cmd/perl-print-version
similarity index 100%
rename from test/unit/mock/cmd/perl-print-version
rename to test/fixtures/cmd/perl-print-version
diff --git a/test/unit/mock/cmd/perl-print-version-not-installed b/test/fixtures/cmd/perl-print-version-not-installed
similarity index 100%
rename from test/unit/mock/cmd/perl-print-version-not-installed
rename to test/fixtures/cmd/perl-print-version-not-installed
diff --git a/test/unit/mock/cmd/ping-example.com b/test/fixtures/cmd/ping-example.com
similarity index 100%
rename from test/unit/mock/cmd/ping-example.com
rename to test/fixtures/cmd/ping-example.com
diff --git a/test/unit/mock/cmd/pip-show-django b/test/fixtures/cmd/pip-show-django
similarity index 100%
rename from test/unit/mock/cmd/pip-show-django
rename to test/fixtures/cmd/pip-show-django
diff --git a/test/unit/mock/cmd/pip-show-jinja2 b/test/fixtures/cmd/pip-show-jinja2
similarity index 100%
rename from test/unit/mock/cmd/pip-show-jinja2
rename to test/fixtures/cmd/pip-show-jinja2
diff --git a/test/unit/mock/cmd/pip-show-non-standard-django b/test/fixtures/cmd/pip-show-non-standard-django
similarity index 100%
rename from test/unit/mock/cmd/pip-show-non-standard-django
rename to test/fixtures/cmd/pip-show-non-standard-django
diff --git a/test/unit/mock/cmd/pkg-info-firewalld b/test/fixtures/cmd/pkg-info-firewalld
similarity index 100%
rename from test/unit/mock/cmd/pkg-info-firewalld
rename to test/fixtures/cmd/pkg-info-firewalld
diff --git a/test/unit/mock/cmd/pkg-info-system-file-system-zfs b/test/fixtures/cmd/pkg-info-system-file-system-zfs
similarity index 100%
rename from test/unit/mock/cmd/pkg-info-system-file-system-zfs
rename to test/fixtures/cmd/pkg-info-system-file-system-zfs
diff --git a/test/unit/mock/cmd/pkginfo-l-SUNWzfsr b/test/fixtures/cmd/pkginfo-l-SUNWzfsr
similarity index 100%
rename from test/unit/mock/cmd/pkginfo-l-SUNWzfsr
rename to test/fixtures/cmd/pkginfo-l-SUNWzfsr
diff --git a/test/unit/mock/cmd/ps-axo b/test/fixtures/cmd/ps-axo
similarity index 100%
rename from test/unit/mock/cmd/ps-axo
rename to test/fixtures/cmd/ps-axo
diff --git a/test/unit/mock/cmd/ps-axoZ b/test/fixtures/cmd/ps-axoZ
similarity index 100%
rename from test/unit/mock/cmd/ps-axoZ
rename to test/fixtures/cmd/ps-axoZ
diff --git a/test/unit/mock/cmd/ps-busybox b/test/fixtures/cmd/ps-busybox
similarity index 100%
rename from test/unit/mock/cmd/ps-busybox
rename to test/fixtures/cmd/ps-busybox
diff --git a/test/unit/mock/cmd/ps-help-busybox b/test/fixtures/cmd/ps-help-busybox
similarity index 100%
rename from test/unit/mock/cmd/ps-help-busybox
rename to test/fixtures/cmd/ps-help-busybox
diff --git a/test/unit/mock/cmd/psql-version b/test/fixtures/cmd/psql-version
similarity index 100%
rename from test/unit/mock/cmd/psql-version
rename to test/fixtures/cmd/psql-version
diff --git a/test/unit/mock/cmd/pw-usershow-root-7 b/test/fixtures/cmd/pw-usershow-root-7
similarity index 100%
rename from test/unit/mock/cmd/pw-usershow-root-7
rename to test/fixtures/cmd/pw-usershow-root-7
diff --git a/test/unit/mock/cmd/r-print-version b/test/fixtures/cmd/r-print-version
similarity index 100%
rename from test/unit/mock/cmd/r-print-version
rename to test/fixtures/cmd/r-print-version
diff --git a/test/unit/mock/cmd/r-print-version-not-installed b/test/fixtures/cmd/r-print-version-not-installed
similarity index 100%
rename from test/unit/mock/cmd/r-print-version-not-installed
rename to test/fixtures/cmd/r-print-version-not-installed
diff --git a/test/unit/mock/cmd/reg_schedule b/test/fixtures/cmd/reg_schedule
similarity index 100%
rename from test/unit/mock/cmd/reg_schedule
rename to test/fixtures/cmd/reg_schedule
diff --git a/test/unit/mock/cmd/rmsock-f0001 b/test/fixtures/cmd/rmsock-f0001
similarity index 100%
rename from test/unit/mock/cmd/rmsock-f0001
rename to test/fixtures/cmd/rmsock-f0001
diff --git a/test/unit/mock/cmd/rmsock-f0002 b/test/fixtures/cmd/rmsock-f0002
similarity index 100%
rename from test/unit/mock/cmd/rmsock-f0002
rename to test/fixtures/cmd/rmsock-f0002
diff --git a/test/unit/mock/cmd/rpm-qa-queryformat b/test/fixtures/cmd/rpm-qa-queryformat
similarity index 100%
rename from test/unit/mock/cmd/rpm-qa-queryformat
rename to test/fixtures/cmd/rpm-qa-queryformat
diff --git a/test/unit/mock/cmd/rpm-qi-curl b/test/fixtures/cmd/rpm-qi-curl
similarity index 100%
rename from test/unit/mock/cmd/rpm-qi-curl
rename to test/fixtures/cmd/rpm-qi-curl
diff --git a/test/unit/mock/cmd/s11-netstat-an-finet-finet6 b/test/fixtures/cmd/s11-netstat-an-finet-finet6
similarity index 100%
rename from test/unit/mock/cmd/s11-netstat-an-finet-finet6
rename to test/fixtures/cmd/s11-netstat-an-finet-finet6
diff --git a/test/unit/mock/cmd/sbin_sysctl b/test/fixtures/cmd/sbin_sysctl
similarity index 100%
rename from test/unit/mock/cmd/sbin_sysctl
rename to test/fixtures/cmd/sbin_sysctl
diff --git a/test/unit/mock/cmd/schtasks-error b/test/fixtures/cmd/schtasks-error
similarity index 100%
rename from test/unit/mock/cmd/schtasks-error
rename to test/fixtures/cmd/schtasks-error
diff --git a/test/unit/mock/cmd/schtasks-success b/test/fixtures/cmd/schtasks-success
similarity index 100%
rename from test/unit/mock/cmd/schtasks-success
rename to test/fixtures/cmd/schtasks-success
diff --git a/test/unit/mock/cmd/schtasks-success-multiple-triggers b/test/fixtures/cmd/schtasks-success-multiple-triggers
similarity index 100%
rename from test/unit/mock/cmd/schtasks-success-multiple-triggers
rename to test/fixtures/cmd/schtasks-success-multiple-triggers
diff --git a/test/unit/mock/cmd/schtasks-success-single-trigger b/test/fixtures/cmd/schtasks-success-single-trigger
similarity index 100%
rename from test/unit/mock/cmd/schtasks-success-single-trigger
rename to test/fixtures/cmd/schtasks-success-single-trigger
diff --git a/test/unit/mock/cmd/secedit-export b/test/fixtures/cmd/secedit-export
similarity index 100%
rename from test/unit/mock/cmd/secedit-export
rename to test/fixtures/cmd/secedit-export
diff --git a/test/unit/mock/cmd/security-identifier-alice b/test/fixtures/cmd/security-identifier-alice
similarity index 100%
rename from test/unit/mock/cmd/security-identifier-alice
rename to test/fixtures/cmd/security-identifier-alice
diff --git a/test/unit/mock/cmd/security-identifier-guests b/test/fixtures/cmd/security-identifier-guests
similarity index 100%
rename from test/unit/mock/cmd/security-identifier-guests
rename to test/fixtures/cmd/security-identifier-guests
diff --git a/test/unit/mock/cmd/security-identifier-unknown b/test/fixtures/cmd/security-identifier-unknown
similarity index 100%
rename from test/unit/mock/cmd/security-identifier-unknown
rename to test/fixtures/cmd/security-identifier-unknown
diff --git a/test/unit/mock/cmd/security-policy-sid-translated b/test/fixtures/cmd/security-policy-sid-translated
similarity index 100%
rename from test/unit/mock/cmd/security-policy-sid-translated
rename to test/fixtures/cmd/security-policy-sid-translated
diff --git a/test/unit/mock/cmd/security-policy-sid-untranslated b/test/fixtures/cmd/security-policy-sid-untranslated
similarity index 100%
rename from test/unit/mock/cmd/security-policy-sid-untranslated
rename to test/fixtures/cmd/security-policy-sid-untranslated
diff --git a/test/unit/mock/cmd/service-e b/test/fixtures/cmd/service-e
similarity index 100%
rename from test/unit/mock/cmd/service-e
rename to test/fixtures/cmd/service-e
diff --git a/test/unit/mock/cmd/service-sendmail-onestatus b/test/fixtures/cmd/service-sendmail-onestatus
similarity index 100%
rename from test/unit/mock/cmd/service-sendmail-onestatus
rename to test/fixtures/cmd/service-sendmail-onestatus
diff --git a/test/unit/mock/cmd/service-sshd-status b/test/fixtures/cmd/service-sshd-status
similarity index 100%
rename from test/unit/mock/cmd/service-sshd-status
rename to test/fixtures/cmd/service-sshd-status
diff --git a/test/unit/mock/cmd/sockstat b/test/fixtures/cmd/sockstat
similarity index 100%
rename from test/unit/mock/cmd/sockstat
rename to test/fixtures/cmd/sockstat
diff --git a/test/unit/mock/cmd/ss-tulpen b/test/fixtures/cmd/ss-tulpen
similarity index 100%
rename from test/unit/mock/cmd/ss-tulpen
rename to test/fixtures/cmd/ss-tulpen
diff --git a/test/unit/mock/cmd/success b/test/fixtures/cmd/success
similarity index 100%
rename from test/unit/mock/cmd/success
rename to test/fixtures/cmd/success
diff --git a/test/unit/mock/cmd/swlist-l-product b/test/fixtures/cmd/swlist-l-product
similarity index 100%
rename from test/unit/mock/cmd/swlist-l-product
rename to test/fixtures/cmd/swlist-l-product
diff --git a/test/unit/mock/cmd/systemctl-is-enabled-apache2-stderr b/test/fixtures/cmd/systemctl-is-enabled-apache2-stderr
similarity index 100%
rename from test/unit/mock/cmd/systemctl-is-enabled-apache2-stderr
rename to test/fixtures/cmd/systemctl-is-enabled-apache2-stderr
diff --git a/test/unit/mock/cmd/systemctl-show-all-apache2 b/test/fixtures/cmd/systemctl-show-all-apache2
similarity index 100%
rename from test/unit/mock/cmd/systemctl-show-all-apache2
rename to test/fixtures/cmd/systemctl-show-all-apache2
diff --git a/test/unit/mock/cmd/systemctl-show-all-dbus b/test/fixtures/cmd/systemctl-show-all-dbus
similarity index 100%
rename from test/unit/mock/cmd/systemctl-show-all-dbus
rename to test/fixtures/cmd/systemctl-show-all-dbus
diff --git a/test/unit/mock/cmd/systemctl-show-all-sshd b/test/fixtures/cmd/systemctl-show-all-sshd
similarity index 100%
rename from test/unit/mock/cmd/systemctl-show-all-sshd
rename to test/fixtures/cmd/systemctl-show-all-sshd
diff --git a/test/unit/mock/cmd/yum-centos7-repolist-all b/test/fixtures/cmd/yum-centos7-repolist-all
similarity index 100%
rename from test/unit/mock/cmd/yum-centos7-repolist-all
rename to test/fixtures/cmd/yum-centos7-repolist-all
diff --git a/test/unit/mock/cmd/yum-centos8-repolist-all b/test/fixtures/cmd/yum-centos8-repolist-all
similarity index 100%
rename from test/unit/mock/cmd/yum-centos8-repolist-all
rename to test/fixtures/cmd/yum-centos8-repolist-all
diff --git a/test/unit/mock/cmd/zfs-get-all-tank-tmp b/test/fixtures/cmd/zfs-get-all-tank-tmp
similarity index 100%
rename from test/unit/mock/cmd/zfs-get-all-tank-tmp
rename to test/fixtures/cmd/zfs-get-all-tank-tmp
diff --git a/test/unit/mock/cmd/zpool-get-all-tank b/test/fixtures/cmd/zpool-get-all-tank
similarity index 100%
rename from test/unit/mock/cmd/zpool-get-all-tank
rename to test/fixtures/cmd/zpool-get-all-tank
diff --git a/test/unit/mock/config_dirs/empty/.gitkeep b/test/fixtures/config_dirs/empty/.gitkeep
similarity index 100%
rename from test/unit/mock/config_dirs/empty/.gitkeep
rename to test/fixtures/config_dirs/empty/.gitkeep
diff --git a/test/unit/mock/config_dirs/fakehome-2/.chef/accepted_licenses/inspec b/test/fixtures/config_dirs/fakehome-2/.chef/accepted_licenses/inspec
similarity index 100%
rename from test/unit/mock/config_dirs/fakehome-2/.chef/accepted_licenses/inspec
rename to test/fixtures/config_dirs/fakehome-2/.chef/accepted_licenses/inspec
diff --git a/test/unit/mock/config_dirs/fakehome-2/.inspec/config.json b/test/fixtures/config_dirs/fakehome-2/.inspec/config.json
similarity index 100%
rename from test/unit/mock/config_dirs/fakehome-2/.inspec/config.json
rename to test/fixtures/config_dirs/fakehome-2/.inspec/config.json
diff --git a/test/unit/mock/config_dirs/fakehome/.inspec/plugins.json b/test/fixtures/config_dirs/fakehome/.inspec/plugins.json
similarity index 71%
rename from test/unit/mock/config_dirs/fakehome/.inspec/plugins.json
rename to test/fixtures/config_dirs/fakehome/.inspec/plugins.json
index 1024845e7..357e9bad4 100644
--- a/test/unit/mock/config_dirs/fakehome/.inspec/plugins.json
+++ b/test/fixtures/config_dirs/fakehome/.inspec/plugins.json
@@ -9,14 +9,14 @@
     {
       "name": "inspec-test-plugin-path",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/inspec-test-plugin-path",
+      "installation_path": "test/fixtures/plugins/inspec-test-plugin-path",
       "version": "0.1.0"
     },
     {
       "name": "inspec-test-home-marker",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/inspec-test-home-marker",
+      "installation_path": "test/fixtures/plugins/inspec-test-home-marker",
       "version": "0.1.0"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/test/unit/mock/config_dirs/input_plugin/plugins.json b/test/fixtures/config_dirs/input_plugin/plugins.json
similarity index 57%
rename from test/unit/mock/config_dirs/input_plugin/plugins.json
rename to test/fixtures/config_dirs/input_plugin/plugins.json
index bead9572c..7f21edc98 100644
--- a/test/unit/mock/config_dirs/input_plugin/plugins.json
+++ b/test/fixtures/config_dirs/input_plugin/plugins.json
@@ -4,7 +4,7 @@
     {
       "name": "inspec-input-test-fixture",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture.rb"
+      "installation_path": "test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture.rb"
     }
   ]
 }
\ No newline at end of file
diff --git a/test/unit/mock/config_dirs/json-config/good.json b/test/fixtures/config_dirs/json-config/good.json
similarity index 100%
rename from test/unit/mock/config_dirs/json-config/good.json
rename to test/fixtures/config_dirs/json-config/good.json
diff --git a/test/unit/mock/config_dirs/json-config/invalid.json b/test/fixtures/config_dirs/json-config/invalid.json
similarity index 100%
rename from test/unit/mock/config_dirs/json-config/invalid.json
rename to test/fixtures/config_dirs/json-config/invalid.json
diff --git a/test/unit/mock/config_dirs/json-config/malformed.json b/test/fixtures/config_dirs/json-config/malformed.json
similarity index 100%
rename from test/unit/mock/config_dirs/json-config/malformed.json
rename to test/fixtures/config_dirs/json-config/malformed.json
diff --git a/test/unit/mock/config_dirs/json-config/mock-credset.json b/test/fixtures/config_dirs/json-config/mock-credset.json
similarity index 100%
rename from test/unit/mock/config_dirs/json-config/mock-credset.json
rename to test/fixtures/config_dirs/json-config/mock-credset.json
diff --git a/test/unit/mock/config_dirs/meaning_by_path/plugins.json b/test/fixtures/config_dirs/meaning_by_path/plugins.json
similarity index 58%
rename from test/unit/mock/config_dirs/meaning_by_path/plugins.json
rename to test/fixtures/config_dirs/meaning_by_path/plugins.json
index 11c1efa9e..7571f661b 100644
--- a/test/unit/mock/config_dirs/meaning_by_path/plugins.json
+++ b/test/fixtures/config_dirs/meaning_by_path/plugins.json
@@ -4,7 +4,7 @@
     {
       "name": "inspec-meaning-of-life",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life"
+      "installation_path": "test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life"
     }
   ]
 }
\ No newline at end of file
diff --git a/test/unit/mock/config_dirs/plugin_config_files/bad_plugin_conf_version.json b/test/fixtures/config_dirs/plugin_config_files/bad_plugin_conf_version.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/bad_plugin_conf_version.json
rename to test/fixtures/config_dirs/plugin_config_files/bad_plugin_conf_version.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/basic.json b/test/fixtures/config_dirs/plugin_config_files/basic.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/basic.json
rename to test/fixtures/config_dirs/plugin_config_files/basic.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/corrupt.json b/test/fixtures/config_dirs/plugin_config_files/corrupt.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/corrupt.json
rename to test/fixtures/config_dirs/plugin_config_files/corrupt.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/entry_bad_installation_type.json b/test/fixtures/config_dirs/plugin_config_files/entry_bad_installation_type.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/entry_bad_installation_type.json
rename to test/fixtures/config_dirs/plugin_config_files/entry_bad_installation_type.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/entry_duplicate.json b/test/fixtures/config_dirs/plugin_config_files/entry_duplicate.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/entry_duplicate.json
rename to test/fixtures/config_dirs/plugin_config_files/entry_duplicate.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/entry_no_name.json b/test/fixtures/config_dirs/plugin_config_files/entry_no_name.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/entry_no_name.json
rename to test/fixtures/config_dirs/plugin_config_files/entry_no_name.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/entry_no_path_for_path_type.json b/test/fixtures/config_dirs/plugin_config_files/entry_no_path_for_path_type.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/entry_no_path_for_path_type.json
rename to test/fixtures/config_dirs/plugin_config_files/entry_no_path_for_path_type.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/entry_not_hash.json b/test/fixtures/config_dirs/plugin_config_files/entry_not_hash.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/entry_not_hash.json
rename to test/fixtures/config_dirs/plugin_config_files/entry_not_hash.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/hash_plugins_key.json b/test/fixtures/config_dirs/plugin_config_files/hash_plugins_key.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/hash_plugins_key.json
rename to test/fixtures/config_dirs/plugin_config_files/hash_plugins_key.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/missing_plugin_conf_version.json b/test/fixtures/config_dirs/plugin_config_files/missing_plugin_conf_version.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/missing_plugin_conf_version.json
rename to test/fixtures/config_dirs/plugin_config_files/missing_plugin_conf_version.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/missing_plugins_key.json b/test/fixtures/config_dirs/plugin_config_files/missing_plugins_key.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/missing_plugins_key.json
rename to test/fixtures/config_dirs/plugin_config_files/missing_plugins_key.json
diff --git a/test/unit/mock/config_dirs/plugin_config_files/no_plugins.json b/test/fixtures/config_dirs/plugin_config_files/no_plugins.json
similarity index 100%
rename from test/unit/mock/config_dirs/plugin_config_files/no_plugins.json
rename to test/fixtures/config_dirs/plugin_config_files/no_plugins.json
diff --git a/test/unit/mock/config_dirs/plugin_error_on_load/plugins.json b/test/fixtures/config_dirs/plugin_error_on_load/plugins.json
similarity index 59%
rename from test/unit/mock/config_dirs/plugin_error_on_load/plugins.json
rename to test/fixtures/config_dirs/plugin_error_on_load/plugins.json
index f7b32b1e3..3654a914c 100644
--- a/test/unit/mock/config_dirs/plugin_error_on_load/plugins.json
+++ b/test/fixtures/config_dirs/plugin_error_on_load/plugins.json
@@ -4,7 +4,7 @@
     {
       "name": "inspec-divide-by-zero",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/inspec-divide-by-zero/inspec-divide-by-zero"
+      "installation_path": "test/fixtures/plugins/inspec-divide-by-zero/inspec-divide-by-zero"
     }
   ]
 }
\ No newline at end of file
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/README.md b/test/fixtures/config_dirs/test-fixture-1-float/README.md
similarity index 54%
rename from test/unit/mock/config_dirs/test-fixture-1-float/README.md
rename to test/fixtures/config_dirs/test-fixture-1-float/README.md
index 761599ff3..9c09eb974 100644
--- a/test/unit/mock/config_dirs/test-fixture-1-float/README.md
+++ b/test/fixtures/config_dirs/test-fixture-1-float/README.md
@@ -3,9 +3,9 @@ This test fixture is a user config dir setup as though the inspec-test-fixture v
 This was accomplished by executing (*without* bundler) the following commands:
 
 ```bash
-mkdir -p test/unit/mock/config_dirs/test-fixture-1-float/gems/{2.3.0,2.4.0,2.5.0}
+mkdir -p test/fixtures/config_dirs/test-fixture-1-float/gems/{2.3.0,2.4.0,2.5.0}
 # Here I'm running a ruby 2.4.x binary with rbenv
-gem install -l -N -i test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0 test/unit/mock/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.1.0.gem
+gem install -l -N -i test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0 test/fixtures/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.1.0.gem
 ```
 
-Note that we will need to add an installation tree each time we support a new minor or major version of the Ruby VM.
\ No newline at end of file
+Note that we will need to add an installation tree each time we support a new minor or major version of the Ruby VM.
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/specifications/inspec-test-fixture-0.1.0.gemspec b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/specifications/inspec-test-fixture-0.1.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.4.0/specifications/inspec-test-fixture-0.1.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.4.0/specifications/inspec-test-fixture-0.1.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/specifications/inspec-test-fixture-0.1.0.gemspec b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/specifications/inspec-test-fixture-0.1.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.5.0/specifications/inspec-test-fixture-0.1.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.5.0/specifications/inspec-test-fixture-0.1.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/gems/inspec-test-fixture-0.1.0/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/specifications/inspec-test-fixture-0.1.0.gemspec b/test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/specifications/inspec-test-fixture-0.1.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-1-float/gems/2.6.0/specifications/inspec-test-fixture-0.1.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-1-float/gems/2.6.0/specifications/inspec-test-fixture-0.1.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-1-float/plugins.json b/test/fixtures/config_dirs/test-fixture-1-float/plugins.json
similarity index 68%
rename from test/unit/mock/config_dirs/test-fixture-1-float/plugins.json
rename to test/fixtures/config_dirs/test-fixture-1-float/plugins.json
index e721bbc72..51de4943f 100644
--- a/test/unit/mock/config_dirs/test-fixture-1-float/plugins.json
+++ b/test/fixtures/config_dirs/test-fixture-1-float/plugins.json
@@ -8,7 +8,7 @@
     {
       "name": "inspec-meaning-of-life",
       "installation_type": "path",
-      "installation_path": "test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life"
+      "installation_path": "test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life"
     }
   ]
 }
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/README.md b/test/fixtures/config_dirs/test-fixture-2-float/README.md
similarity index 59%
rename from test/unit/mock/config_dirs/test-fixture-2-float/README.md
rename to test/fixtures/config_dirs/test-fixture-2-float/README.md
index 6eeb390c8..0e5ec6060 100644
--- a/test/unit/mock/config_dirs/test-fixture-2-float/README.md
+++ b/test/fixtures/config_dirs/test-fixture-2-float/README.md
@@ -5,9 +5,9 @@ This is interesting because (unlike 0.1.0) v0.2.0 has a gem dependency.
 This was accomplished by executing (*without* bundler) the following commands:
 
 ```bash
-mkdir -p test/unit/mock/config_dirs/test-fixture-2-float/gems/{2.3.0,2.4.0,2.5.0}
+mkdir -p test/fixtures/config_dirs/test-fixture-2-float/gems/{2.3.0,2.4.0,2.5.0}
 # Here I'm running a ruby 2.4.x binary with rbenv
-gem install -N -i test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0 test/unit/mock/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.2.0.gem
+gem install -N -i test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0 test/fixtures/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.2.0.gem
 ```
 
-Note that we will need to add an installation tree each time we support a new minor or major version of the Ruby VM.
\ No newline at end of file
+Note that we will need to add an installation tree each time we support a new minor or major version of the Ruby VM.
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/README.rdoc b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/README.rdoc
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/README.rdoc
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/README.rdoc
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/inspec-test-fixture-0.2.0.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/inspec-test-fixture-0.2.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/inspec-test-fixture-0.2.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/inspec-test-fixture-0.2.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/ordinal_array-0.2.0.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/ordinal_array-0.2.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/ordinal_array-0.2.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.4.0/specifications/ordinal_array-0.2.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/README.rdoc b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/README.rdoc
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/README.rdoc
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/README.rdoc
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/inspec-test-fixture-0.2.0.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/inspec-test-fixture-0.2.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/inspec-test-fixture-0.2.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/inspec-test-fixture-0.2.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/ordinal_array-0.2.0.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/ordinal_array-0.2.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/ordinal_array-0.2.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.5.0/specifications/ordinal_array-0.2.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/inspec-test-fixture-0.2.0/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/README.rdoc b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/README.rdoc
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/README.rdoc
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/README.rdoc
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/lib/ordinal_array/ordinal_constants.rb
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/gems/ordinal_array-0.2.0/ordinal_array.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/inspec-test-fixture-0.2.0.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/inspec-test-fixture-0.2.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/inspec-test-fixture-0.2.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/inspec-test-fixture-0.2.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/ordinal_array-0.2.0.gemspec b/test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/ordinal_array-0.2.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/ordinal_array-0.2.0.gemspec
rename to test/fixtures/config_dirs/test-fixture-2-float/gems/2.6.0/specifications/ordinal_array-0.2.0.gemspec
diff --git a/test/unit/mock/config_dirs/test-fixture-2-float/plugins.json b/test/fixtures/config_dirs/test-fixture-2-float/plugins.json
similarity index 100%
rename from test/unit/mock/config_dirs/test-fixture-2-float/plugins.json
rename to test/fixtures/config_dirs/test-fixture-2-float/plugins.json
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/LICENSE b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/LICENSE
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/LICENSE
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/LICENSE
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/README.md b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/README.md
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/README.md
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/README.md
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/specifications/train-test-fixture-0.1.0.gemspec b/test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/specifications/train-test-fixture-0.1.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.4.0/specifications/train-test-fixture-0.1.0.gemspec
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.4.0/specifications/train-test-fixture-0.1.0.gemspec
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/LICENSE b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/LICENSE
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/LICENSE
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/LICENSE
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/README.md b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/README.md
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/README.md
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/README.md
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/specifications/train-test-fixture-0.1.0.gemspec b/test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/specifications/train-test-fixture-0.1.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.5.0/specifications/train-test-fixture-0.1.0.gemspec
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.5.0/specifications/train-test-fixture-0.1.0.gemspec
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/LICENSE b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/LICENSE
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/LICENSE
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/LICENSE
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/README.md b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/README.md
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/README.md
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/README.md
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/connection.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/platform.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/transport.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/lib/train-test-fixture/version.rb
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/gems/train-test-fixture-0.1.0/train-test-fixture.gemspec
diff --git a/test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/specifications/train-test-fixture-0.1.0.gemspec b/test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/specifications/train-test-fixture-0.1.0.gemspec
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/gems/2.6.0/specifications/train-test-fixture-0.1.0.gemspec
rename to test/fixtures/config_dirs/train-test-fixture/gems/2.6.0/specifications/train-test-fixture-0.1.0.gemspec
diff --git a/test/unit/mock/config_dirs/train-test-fixture/plugins.json b/test/fixtures/config_dirs/train-test-fixture/plugins.json
similarity index 100%
rename from test/unit/mock/config_dirs/train-test-fixture/plugins.json
rename to test/fixtures/config_dirs/train-test-fixture/plugins.json
diff --git a/test/unit/mock/files/9.5.main/.gitkeep b/test/fixtures/files/9.5.main/.gitkeep
similarity index 100%
rename from test/unit/mock/files/9.5.main/.gitkeep
rename to test/fixtures/files/9.5.main/.gitkeep
diff --git a/test/unit/mock/files/aide.conf b/test/fixtures/files/aide.conf
similarity index 100%
rename from test/unit/mock/files/aide.conf
rename to test/fixtures/files/aide.conf
diff --git a/test/unit/mock/files/apache2.conf b/test/fixtures/files/apache2.conf
similarity index 100%
rename from test/unit/mock/files/apache2.conf
rename to test/fixtures/files/apache2.conf
diff --git a/test/unit/mock/files/auditd.conf b/test/fixtures/files/auditd.conf
similarity index 100%
rename from test/unit/mock/files/auditd.conf
rename to test/fixtures/files/auditd.conf
diff --git a/test/unit/mock/files/aws_billing_backend.rb b/test/fixtures/files/aws_billing_backend.rb
similarity index 100%
rename from test/unit/mock/files/aws_billing_backend.rb
rename to test/fixtures/files/aws_billing_backend.rb
diff --git a/test/unit/mock/files/bond0 b/test/fixtures/files/bond0
similarity index 100%
rename from test/unit/mock/files/bond0
rename to test/fixtures/files/bond0
diff --git a/test/unit/mock/files/crondotd b/test/fixtures/files/crondotd
similarity index 100%
rename from test/unit/mock/files/crondotd
rename to test/fixtures/files/crondotd
diff --git a/test/unit/mock/files/database.xml b/test/fixtures/files/database.xml
similarity index 100%
rename from test/unit/mock/files/database.xml
rename to test/fixtures/files/database.xml
diff --git a/test/unit/mock/files/default.toml b/test/fixtures/files/default.toml
similarity index 100%
rename from test/unit/mock/files/default.toml
rename to test/fixtures/files/default.toml
diff --git a/test/unit/mock/files/default.xml b/test/fixtures/files/default.xml
similarity index 100%
rename from test/unit/mock/files/default.xml
rename to test/fixtures/files/default.xml
diff --git a/test/unit/mock/files/dh_params.dh_pem b/test/fixtures/files/dh_params.dh_pem
similarity index 100%
rename from test/unit/mock/files/dh_params.dh_pem
rename to test/fixtures/files/dh_params.dh_pem
diff --git a/test/unit/mock/files/emptyfile b/test/fixtures/files/emptyfile
similarity index 100%
rename from test/unit/mock/files/emptyfile
rename to test/fixtures/files/emptyfile
diff --git a/test/unit/mock/files/etcgroup b/test/fixtures/files/etcgroup
similarity index 100%
rename from test/unit/mock/files/etcgroup
rename to test/fixtures/files/etcgroup
diff --git a/test/unit/mock/files/example.csv b/test/fixtures/files/example.csv
similarity index 100%
rename from test/unit/mock/files/example.csv
rename to test/fixtures/files/example.csv
diff --git a/test/unit/mock/files/fstab b/test/fixtures/files/fstab
similarity index 100%
rename from test/unit/mock/files/fstab
rename to test/fixtures/files/fstab
diff --git a/test/unit/mock/files/fstab_no_home b/test/fixtures/files/fstab_no_home
similarity index 100%
rename from test/unit/mock/files/fstab_no_home
rename to test/fixtures/files/fstab_no_home
diff --git a/test/unit/mock/files/fstab_one_mount b/test/fixtures/files/fstab_one_mount
similarity index 100%
rename from test/unit/mock/files/fstab_one_mount
rename to test/fixtures/files/fstab_one_mount
diff --git a/test/unit/mock/files/grub.conf b/test/fixtures/files/grub.conf
similarity index 100%
rename from test/unit/mock/files/grub.conf
rename to test/fixtures/files/grub.conf
diff --git a/test/unit/mock/files/grub2.cfg b/test/fixtures/files/grub2.cfg
similarity index 100%
rename from test/unit/mock/files/grub2.cfg
rename to test/fixtures/files/grub2.cfg
diff --git a/test/unit/mock/files/grub_defaults b/test/fixtures/files/grub_defaults
similarity index 100%
rename from test/unit/mock/files/grub_defaults
rename to test/fixtures/files/grub_defaults
diff --git a/test/unit/mock/files/grub_defaults_with_saved b/test/fixtures/files/grub_defaults_with_saved
similarity index 100%
rename from test/unit/mock/files/grub_defaults_with_saved
rename to test/fixtures/files/grub_defaults_with_saved
diff --git a/test/unit/mock/files/grubenv b/test/fixtures/files/grubenv
similarity index 100%
rename from test/unit/mock/files/grubenv
rename to test/fixtures/files/grubenv
diff --git a/test/unit/mock/files/grubenv_invalid b/test/fixtures/files/grubenv_invalid
similarity index 100%
rename from test/unit/mock/files/grubenv_invalid
rename to test/fixtures/files/grubenv_invalid
diff --git a/test/unit/mock/files/hosts b/test/fixtures/files/hosts
similarity index 100%
rename from test/unit/mock/files/hosts
rename to test/fixtures/files/hosts
diff --git a/test/unit/mock/files/hosts.allow b/test/fixtures/files/hosts.allow
similarity index 100%
rename from test/unit/mock/files/hosts.allow
rename to test/fixtures/files/hosts.allow
diff --git a/test/unit/mock/files/hosts.deny b/test/fixtures/files/hosts.deny
similarity index 100%
rename from test/unit/mock/files/hosts.deny
rename to test/fixtures/files/hosts.deny
diff --git a/test/unit/mock/files/httpd.conf b/test/fixtures/files/httpd.conf
similarity index 100%
rename from test/unit/mock/files/httpd.conf
rename to test/fixtures/files/httpd.conf
diff --git a/test/unit/mock/files/inetd.conf b/test/fixtures/files/inetd.conf
similarity index 100%
rename from test/unit/mock/files/inetd.conf
rename to test/fixtures/files/inetd.conf
diff --git a/test/unit/mock/files/kitchen.yml b/test/fixtures/files/kitchen.yml
similarity index 100%
rename from test/unit/mock/files/kitchen.yml
rename to test/fixtures/files/kitchen.yml
diff --git a/test/unit/mock/files/limits.conf b/test/fixtures/files/limits.conf
similarity index 100%
rename from test/unit/mock/files/limits.conf
rename to test/fixtures/files/limits.conf
diff --git a/test/unit/mock/files/login.defs b/test/fixtures/files/login.defs
similarity index 100%
rename from test/unit/mock/files/login.defs
rename to test/fixtures/files/login.defs
diff --git a/test/unit/mock/files/main.cf b/test/fixtures/files/main.cf
similarity index 100%
rename from test/unit/mock/files/main.cf
rename to test/fixtures/files/main.cf
diff --git a/test/unit/mock/files/mysql.conf b/test/fixtures/files/mysql.conf
similarity index 100%
rename from test/unit/mock/files/mysql.conf
rename to test/fixtures/files/mysql.conf
diff --git a/test/unit/mock/files/mysql2.conf b/test/fixtures/files/mysql2.conf
similarity index 100%
rename from test/unit/mock/files/mysql2.conf
rename to test/fixtures/files/mysql2.conf
diff --git a/test/unit/mock/files/nginx.conf b/test/fixtures/files/nginx.conf
similarity index 100%
rename from test/unit/mock/files/nginx.conf
rename to test/fixtures/files/nginx.conf
diff --git a/test/unit/mock/files/nginx_confd_comments_only.conf b/test/fixtures/files/nginx_confd_comments_only.conf
similarity index 100%
rename from test/unit/mock/files/nginx_confd_comments_only.conf
rename to test/fixtures/files/nginx_confd_comments_only.conf
diff --git a/test/unit/mock/files/nginx_confd_empty.conf b/test/fixtures/files/nginx_confd_empty.conf
similarity index 100%
rename from test/unit/mock/files/nginx_confd_empty.conf
rename to test/fixtures/files/nginx_confd_empty.conf
diff --git a/test/unit/mock/files/nginx_confd_foobar.conf b/test/fixtures/files/nginx_confd_foobar.conf
similarity index 100%
rename from test/unit/mock/files/nginx_confd_foobar.conf
rename to test/fixtures/files/nginx_confd_foobar.conf
diff --git a/test/unit/mock/files/nginx_confd_multiple.conf b/test/fixtures/files/nginx_confd_multiple.conf
similarity index 100%
rename from test/unit/mock/files/nginx_confd_multiple.conf
rename to test/fixtures/files/nginx_confd_multiple.conf
diff --git a/test/unit/mock/files/nginx_failed.conf b/test/fixtures/files/nginx_failed.conf
similarity index 100%
rename from test/unit/mock/files/nginx_failed.conf
rename to test/fixtures/files/nginx_failed.conf
diff --git a/test/unit/mock/files/nginx_mime.types b/test/fixtures/files/nginx_mime.types
similarity index 100%
rename from test/unit/mock/files/nginx_mime.types
rename to test/fixtures/files/nginx_mime.types
diff --git a/test/unit/mock/files/nginx_proxy.conf b/test/fixtures/files/nginx_proxy.conf
similarity index 100%
rename from test/unit/mock/files/nginx_proxy.conf
rename to test/fixtures/files/nginx_proxy.conf
diff --git a/test/unit/mock/files/nginx_quotesd_example.conf b/test/fixtures/files/nginx_quotesd_example.conf
similarity index 100%
rename from test/unit/mock/files/nginx_quotesd_example.conf
rename to test/fixtures/files/nginx_quotesd_example.conf
diff --git a/test/unit/mock/files/ntp.conf b/test/fixtures/files/ntp.conf
similarity index 100%
rename from test/unit/mock/files/ntp.conf
rename to test/fixtures/files/ntp.conf
diff --git a/test/unit/mock/files/other.cf b/test/fixtures/files/other.cf
similarity index 100%
rename from test/unit/mock/files/other.cf
rename to test/fixtures/files/other.cf
diff --git a/test/unit/mock/files/passwd b/test/fixtures/files/passwd
similarity index 100%
rename from test/unit/mock/files/passwd
rename to test/fixtures/files/passwd
diff --git a/test/unit/mock/files/pg_hba.conf b/test/fixtures/files/pg_hba.conf
similarity index 100%
rename from test/unit/mock/files/pg_hba.conf
rename to test/fixtures/files/pg_hba.conf
diff --git a/test/unit/mock/files/pg_ident.conf b/test/fixtures/files/pg_ident.conf
similarity index 100%
rename from test/unit/mock/files/pg_ident.conf
rename to test/fixtures/files/pg_ident.conf
diff --git a/test/unit/mock/files/policyfile.lock.json b/test/fixtures/files/policyfile.lock.json
similarity index 100%
rename from test/unit/mock/files/policyfile.lock.json
rename to test/fixtures/files/policyfile.lock.json
diff --git a/test/unit/mock/files/ports.conf b/test/fixtures/files/ports.conf
similarity index 100%
rename from test/unit/mock/files/ports.conf
rename to test/fixtures/files/ports.conf
diff --git a/test/unit/mock/files/postgresql.conf b/test/fixtures/files/postgresql.conf
similarity index 100%
rename from test/unit/mock/files/postgresql.conf
rename to test/fixtures/files/postgresql.conf
diff --git a/test/unit/mock/files/rabbitmq.config b/test/fixtures/files/rabbitmq.config
similarity index 100%
rename from test/unit/mock/files/rabbitmq.config
rename to test/fixtures/files/rabbitmq.config
diff --git a/test/unit/mock/files/rootwrap.conf b/test/fixtures/files/rootwrap.conf
similarity index 100%
rename from test/unit/mock/files/rootwrap.conf
rename to test/fixtures/files/rootwrap.conf
diff --git a/test/unit/mock/files/security.conf b/test/fixtures/files/security.conf
similarity index 100%
rename from test/unit/mock/files/security.conf
rename to test/fixtures/files/security.conf
diff --git a/test/unit/mock/files/serve-cgi-bin.conf b/test/fixtures/files/serve-cgi-bin.conf
similarity index 100%
rename from test/unit/mock/files/serve-cgi-bin.conf
rename to test/fixtures/files/serve-cgi-bin.conf
diff --git a/test/unit/mock/files/shadow b/test/fixtures/files/shadow
similarity index 100%
rename from test/unit/mock/files/shadow
rename to test/fixtures/files/shadow
diff --git a/test/unit/mock/files/ssh_config b/test/fixtures/files/ssh_config
similarity index 100%
rename from test/unit/mock/files/ssh_config
rename to test/fixtures/files/ssh_config
diff --git a/test/unit/mock/files/sshd_config b/test/fixtures/files/sshd_config
similarity index 100%
rename from test/unit/mock/files/sshd_config
rename to test/fixtures/files/sshd_config
diff --git a/test/unit/mock/files/ssl.conf b/test/fixtures/files/ssl.conf
similarity index 100%
rename from test/unit/mock/files/ssl.conf
rename to test/fixtures/files/ssl.conf
diff --git a/test/unit/mock/files/status.conf b/test/fixtures/files/status.conf
similarity index 100%
rename from test/unit/mock/files/status.conf
rename to test/fixtures/files/status.conf
diff --git a/test/unit/mock/files/sysctl.conf b/test/fixtures/files/sysctl.conf
similarity index 100%
rename from test/unit/mock/files/sysctl.conf
rename to test/fixtures/files/sysctl.conf
diff --git a/test/unit/mock/files/test_ca_public.key.pem b/test/fixtures/files/test_ca_public.key.pem
similarity index 100%
rename from test/unit/mock/files/test_ca_public.key.pem
rename to test/fixtures/files/test_ca_public.key.pem
diff --git a/test/unit/mock/files/test_certificate.rsa.crt.pem b/test/fixtures/files/test_certificate.rsa.crt.pem
similarity index 100%
rename from test/unit/mock/files/test_certificate.rsa.crt.pem
rename to test/fixtures/files/test_certificate.rsa.crt.pem
diff --git a/test/unit/mock/files/test_certificate.rsa.key.pem b/test/fixtures/files/test_certificate.rsa.key.pem
similarity index 100%
rename from test/unit/mock/files/test_certificate.rsa.key.pem
rename to test/fixtures/files/test_certificate.rsa.key.pem
diff --git a/test/unit/mock/files/upstart_ssh_enabled.conf b/test/fixtures/files/upstart_ssh_enabled.conf
similarity index 100%
rename from test/unit/mock/files/upstart_ssh_enabled.conf
rename to test/fixtures/files/upstart_ssh_enabled.conf
diff --git a/test/unit/mock/files/var.9.5.main/.gitkeep b/test/fixtures/files/var.9.5.main/.gitkeep
similarity index 100%
rename from test/unit/mock/files/var.9.5.main/.gitkeep
rename to test/fixtures/files/var.9.5.main/.gitkeep
diff --git a/test/unit/mock/files/xinetd.conf b/test/fixtures/files/xinetd.conf
similarity index 100%
rename from test/unit/mock/files/xinetd.conf
rename to test/fixtures/files/xinetd.conf
diff --git a/test/unit/mock/files/xinetd.d/.gitkeep b/test/fixtures/files/xinetd.d/.gitkeep
similarity index 100%
rename from test/unit/mock/files/xinetd.d/.gitkeep
rename to test/fixtures/files/xinetd.d/.gitkeep
diff --git a/test/unit/mock/files/xinetd.d_chargen-dgram b/test/fixtures/files/xinetd.d_chargen-dgram
similarity index 100%
rename from test/unit/mock/files/xinetd.d_chargen-dgram
rename to test/fixtures/files/xinetd.d_chargen-dgram
diff --git a/test/unit/mock/files/xinetd.d_chargen-stream b/test/fixtures/files/xinetd.d_chargen-stream
similarity index 100%
rename from test/unit/mock/files/xinetd.d_chargen-stream
rename to test/fixtures/files/xinetd.d_chargen-stream
diff --git a/test/unit/mock/files/xinetd.d_echo b/test/fixtures/files/xinetd.d_echo
similarity index 100%
rename from test/unit/mock/files/xinetd.d_echo
rename to test/fixtures/files/xinetd.d_echo
diff --git a/test/unit/mock/plugins/inspec-divide-by-zero/inspec-divide-by-zero.rb b/test/fixtures/plugins/inspec-divide-by-zero/inspec-divide-by-zero.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-divide-by-zero/inspec-divide-by-zero.rb
rename to test/fixtures/plugins/inspec-divide-by-zero/inspec-divide-by-zero.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/control_dsl.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/control_dsl.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/control_dsl.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/control_dsl.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/describe_dsl.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/describe_dsl.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/describe_dsl.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/describe_dsl.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/outer_profile_dsl.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/outer_profile_dsl.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/outer_profile_dsl.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/outer_profile_dsl.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/plugin.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/plugin.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/plugin.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/plugin.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/resource_dsl.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/resource_dsl.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/resource_dsl.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/resource_dsl.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/test_dsl.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/test_dsl.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/test_dsl.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/test_dsl.rb
diff --git a/test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/version.rb b/test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/version.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-dsl-test/lib/inspec-dsl-test/version.rb
rename to test/fixtures/plugins/inspec-dsl-test/lib/inspec-dsl-test/version.rb
diff --git a/test/unit/mock/plugins/inspec-input-test-fixture/README.md b/test/fixtures/plugins/inspec-input-test-fixture/README.md
similarity index 100%
rename from test/unit/mock/plugins/inspec-input-test-fixture/README.md
rename to test/fixtures/plugins/inspec-input-test-fixture/README.md
diff --git a/test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture.rb b/test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture.rb
rename to test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture.rb
diff --git a/test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/input.rb b/test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/input.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/input.rb
rename to test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/input.rb
diff --git a/test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/plugin.rb b/test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/plugin.rb
rename to test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/plugin.rb
diff --git a/test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/version.rb b/test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/version.rb
rename to test/fixtures/plugins/inspec-input-test-fixture/lib/inspec-input-test-fixture/version.rb
diff --git a/test/unit/mock/plugins/inspec-test-fixture/README.md b/test/fixtures/plugins/inspec-test-fixture/README.md
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/README.md
rename to test/fixtures/plugins/inspec-test-fixture/README.md
diff --git a/test/unit/mock/plugins/inspec-test-fixture/Rakefile b/test/fixtures/plugins/inspec-test-fixture/Rakefile
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/Rakefile
rename to test/fixtures/plugins/inspec-test-fixture/Rakefile
diff --git a/test/unit/mock/plugins/inspec-test-fixture/inspec-test-fixture.gemspec b/test/fixtures/plugins/inspec-test-fixture/inspec-test-fixture.gemspec
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/inspec-test-fixture.gemspec
rename to test/fixtures/plugins/inspec-test-fixture/inspec-test-fixture.gemspec
diff --git a/test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture.rb b/test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture.rb
rename to test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture.rb
diff --git a/test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture/mock_plugin.rb b/test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture/mock_plugin.rb
rename to test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture/mock_plugin.rb
diff --git a/test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture/plugin.rb b/test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture/plugin.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture/plugin.rb
rename to test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture/plugin.rb
diff --git a/test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture/version.rb b/test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture/version.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/lib/inspec-test-fixture/version.rb
rename to test/fixtures/plugins/inspec-test-fixture/lib/inspec-test-fixture/version.rb
diff --git a/test/unit/mock/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.1.0.gem b/test/fixtures/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.1.0.gem
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.1.0.gem
rename to test/fixtures/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.1.0.gem
diff --git a/test/unit/mock/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.2.0.gem b/test/fixtures/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.2.0.gem
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.2.0.gem
rename to test/fixtures/plugins/inspec-test-fixture/pkg/inspec-test-fixture-0.2.0.gem
diff --git a/test/unit/mock/plugins/inspec-test-ui/README.md b/test/fixtures/plugins/inspec-test-ui/README.md
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-ui/README.md
rename to test/fixtures/plugins/inspec-test-ui/README.md
diff --git a/test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui.rb b/test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui.rb
rename to test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui.rb
diff --git a/test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui/cli_command.rb b/test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui/cli_command.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui/cli_command.rb
rename to test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui/cli_command.rb
diff --git a/test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui/plugin.rb b/test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui/plugin.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui/plugin.rb
rename to test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui/plugin.rb
diff --git a/test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui/version.rb b/test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui/version.rb
similarity index 100%
rename from test/unit/mock/plugins/inspec-test-ui/lib/inspec-test-ui/version.rb
rename to test/fixtures/plugins/inspec-test-ui/lib/inspec-test-ui/version.rb
diff --git a/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life.rb b/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life.rb
new file mode 100644
index 000000000..fa230bc43
--- /dev/null
+++ b/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life.rb
@@ -0,0 +1,2 @@
+# NOTE: we can't use require, because these test files are repeatedly reloaded
+load "test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb"
diff --git a/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/cli_command.rb b/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/cli_command.rb
similarity index 100%
rename from test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/cli_command.rb
rename to test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/cli_command.rb
diff --git a/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/mock_plugin.rb b/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/mock_plugin.rb
similarity index 100%
rename from test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/mock_plugin.rb
rename to test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/mock_plugin.rb
diff --git a/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb b/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb
similarity index 72%
rename from test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb
rename to test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb
index 76761cc9e..c36706eb2 100644
--- a/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb
+++ b/test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb
@@ -6,13 +6,13 @@ module InspecPlugins
 
       mock_plugin_type :'meaning-of-life-the-universe-and-everything' do
         # NOTE: we can't use require, because these test files are repeatedly reloaded
-        load "test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/mock_plugin.rb"
+        load "test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/mock_plugin.rb"
         InspecPlugins::MeaningOfLife::MockPlugin
       end
 
       cli_command :meaningoflife do
         # NOTE: we can't use require, because these test files are repeatedly reloaded
-        load "test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/cli_command.rb"
+        load "test/fixtures/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/cli_command.rb"
         InspecPlugins::MeaningOfLife::CliCommand
       end
     end
diff --git a/test/unit/mock/profiles/archive-depends/inspec.yml b/test/fixtures/profiles/archive-depends/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/archive-depends/inspec.yml
rename to test/fixtures/profiles/archive-depends/inspec.yml
diff --git a/test/unit/mock/profiles/archived-profiles/tar_profile-1.0.0.tar.gz b/test/fixtures/profiles/archived-profiles/tar_profile-1.0.0.tar.gz
similarity index 100%
rename from test/unit/mock/profiles/archived-profiles/tar_profile-1.0.0.tar.gz
rename to test/fixtures/profiles/archived-profiles/tar_profile-1.0.0.tar.gz
diff --git a/test/unit/mock/profiles/archived-profiles/zip_profile-1.0.0.zip b/test/fixtures/profiles/archived-profiles/zip_profile-1.0.0.zip
similarity index 100%
rename from test/unit/mock/profiles/archived-profiles/zip_profile-1.0.0.zip
rename to test/fixtures/profiles/archived-profiles/zip_profile-1.0.0.zip
diff --git a/test/unit/mock/profiles/aws-profile/controls/aws.rb b/test/fixtures/profiles/aws-profile/controls/aws.rb
similarity index 100%
rename from test/unit/mock/profiles/aws-profile/controls/aws.rb
rename to test/fixtures/profiles/aws-profile/controls/aws.rb
diff --git a/test/unit/mock/profiles/aws-profile/inspec.yml b/test/fixtures/profiles/aws-profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/aws-profile/inspec.yml
rename to test/fixtures/profiles/aws-profile/inspec.yml
diff --git a/test/unit/mock/profiles/complete-metadata/inspec.yml b/test/fixtures/profiles/complete-metadata/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/complete-metadata/inspec.yml
rename to test/fixtures/profiles/complete-metadata/inspec.yml
diff --git a/test/unit/mock/profiles/complete-profile/controls/host_spec.rb b/test/fixtures/profiles/complete-profile/controls/host_spec.rb
similarity index 100%
rename from test/unit/mock/profiles/complete-profile/controls/host_spec.rb
rename to test/fixtures/profiles/complete-profile/controls/host_spec.rb
diff --git a/test/unit/mock/profiles/complete-profile/files/a_sub_dir/sub_items.conf b/test/fixtures/profiles/complete-profile/files/a_sub_dir/sub_items.conf
similarity index 100%
rename from test/unit/mock/profiles/complete-profile/files/a_sub_dir/sub_items.conf
rename to test/fixtures/profiles/complete-profile/files/a_sub_dir/sub_items.conf
diff --git a/test/unit/mock/profiles/complete-profile/files/items.conf b/test/fixtures/profiles/complete-profile/files/items.conf
similarity index 100%
rename from test/unit/mock/profiles/complete-profile/files/items.conf
rename to test/fixtures/profiles/complete-profile/files/items.conf
diff --git a/test/unit/mock/profiles/complete-profile/inspec.yml b/test/fixtures/profiles/complete-profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/complete-profile/inspec.yml
rename to test/fixtures/profiles/complete-profile/inspec.yml
diff --git a/test/unit/mock/profiles/complete-profile/libraries/testlib.rb b/test/fixtures/profiles/complete-profile/libraries/testlib.rb
similarity index 100%
rename from test/unit/mock/profiles/complete-profile/libraries/testlib.rb
rename to test/fixtures/profiles/complete-profile/libraries/testlib.rb
diff --git a/test/unit/mock/profiles/control_metadata/controls/example.rb b/test/fixtures/profiles/control_metadata/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/control_metadata/controls/example.rb
rename to test/fixtures/profiles/control_metadata/controls/example.rb
diff --git a/test/unit/mock/profiles/control_metadata/inspec.yml b/test/fixtures/profiles/control_metadata/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/control_metadata/inspec.yml
rename to test/fixtures/profiles/control_metadata/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/inheritance/controls/example.rb b/test/fixtures/profiles/dependencies/inheritance/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/inheritance/controls/example.rb
rename to test/fixtures/profiles/dependencies/inheritance/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/inheritance/inspec.yml b/test/fixtures/profiles/dependencies/inheritance/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/inheritance/inspec.yml
rename to test/fixtures/profiles/dependencies/inheritance/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/profile_a/controls/example.rb b/test/fixtures/profiles/dependencies/profile_a/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_a/controls/example.rb
rename to test/fixtures/profiles/dependencies/profile_a/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/profile_a/inspec.yml b/test/fixtures/profiles/dependencies/profile_a/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_a/inspec.yml
rename to test/fixtures/profiles/dependencies/profile_a/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/profile_b/controls/example.rb b/test/fixtures/profiles/dependencies/profile_b/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_b/controls/example.rb
rename to test/fixtures/profiles/dependencies/profile_b/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/profile_b/inspec.yml b/test/fixtures/profiles/dependencies/profile_b/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_b/inspec.yml
rename to test/fixtures/profiles/dependencies/profile_b/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/profile_c/controls/example.rb b/test/fixtures/profiles/dependencies/profile_c/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_c/controls/example.rb
rename to test/fixtures/profiles/dependencies/profile_c/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/profile_c/inspec.yml b/test/fixtures/profiles/dependencies/profile_c/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_c/inspec.yml
rename to test/fixtures/profiles/dependencies/profile_c/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/profile_c/libraries/.gitkeep b/test/fixtures/profiles/dependencies/profile_c/libraries/.gitkeep
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_c/libraries/.gitkeep
rename to test/fixtures/profiles/dependencies/profile_c/libraries/.gitkeep
diff --git a/test/unit/mock/profiles/dependencies/profile_c/libraries/example_config.rb b/test/fixtures/profiles/dependencies/profile_c/libraries/example_config.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_c/libraries/example_config.rb
rename to test/fixtures/profiles/dependencies/profile_c/libraries/example_config.rb
diff --git a/test/unit/mock/profiles/dependencies/profile_d/controls/example.rb b/test/fixtures/profiles/dependencies/profile_d/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_d/controls/example.rb
rename to test/fixtures/profiles/dependencies/profile_d/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/profile_d/inspec.yml b/test/fixtures/profiles/dependencies/profile_d/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_d/inspec.yml
rename to test/fixtures/profiles/dependencies/profile_d/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/profile_d/libraries/.gitkeep b/test/fixtures/profiles/dependencies/profile_d/libraries/.gitkeep
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_d/libraries/.gitkeep
rename to test/fixtures/profiles/dependencies/profile_d/libraries/.gitkeep
diff --git a/test/unit/mock/profiles/dependencies/profile_d/libraries/example_config.rb b/test/fixtures/profiles/dependencies/profile_d/libraries/example_config.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/profile_d/libraries/example_config.rb
rename to test/fixtures/profiles/dependencies/profile_d/libraries/example_config.rb
diff --git a/test/unit/mock/profiles/dependencies/require_controls_test/controls/example.rb b/test/fixtures/profiles/dependencies/require_controls_test/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/require_controls_test/controls/example.rb
rename to test/fixtures/profiles/dependencies/require_controls_test/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/require_controls_test/inspec.yml b/test/fixtures/profiles/dependencies/require_controls_test/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/require_controls_test/inspec.yml
rename to test/fixtures/profiles/dependencies/require_controls_test/inspec.yml
diff --git a/test/unit/mock/profiles/dependencies/resource-namespace/controls/example.rb b/test/fixtures/profiles/dependencies/resource-namespace/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/dependencies/resource-namespace/controls/example.rb
rename to test/fixtures/profiles/dependencies/resource-namespace/controls/example.rb
diff --git a/test/unit/mock/profiles/dependencies/resource-namespace/inspec.yml b/test/fixtures/profiles/dependencies/resource-namespace/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dependencies/resource-namespace/inspec.yml
rename to test/fixtures/profiles/dependencies/resource-namespace/inspec.yml
diff --git a/test/unit/mock/profiles/deprecation/bare/README.md b/test/fixtures/profiles/deprecation/bare/README.md
similarity index 100%
rename from test/unit/mock/profiles/deprecation/bare/README.md
rename to test/fixtures/profiles/deprecation/bare/README.md
diff --git a/test/unit/mock/profiles/deprecation/bare/controls/bare.rb b/test/fixtures/profiles/deprecation/bare/controls/bare.rb
similarity index 100%
rename from test/unit/mock/profiles/deprecation/bare/controls/bare.rb
rename to test/fixtures/profiles/deprecation/bare/controls/bare.rb
diff --git a/test/unit/mock/profiles/deprecation/bare/inspec.yml b/test/fixtures/profiles/deprecation/bare/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/deprecation/bare/inspec.yml
rename to test/fixtures/profiles/deprecation/bare/inspec.yml
diff --git a/test/unit/mock/profiles/deprecation/check/inspec.yml b/test/fixtures/profiles/deprecation/check/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/deprecation/check/inspec.yml
rename to test/fixtures/profiles/deprecation/check/inspec.yml
diff --git a/test/unit/mock/profiles/deprecation/resource_pack/README.md b/test/fixtures/profiles/deprecation/resource_pack/README.md
similarity index 100%
rename from test/unit/mock/profiles/deprecation/resource_pack/README.md
rename to test/fixtures/profiles/deprecation/resource_pack/README.md
diff --git a/test/unit/mock/profiles/deprecation/resource_pack/inspec.yml b/test/fixtures/profiles/deprecation/resource_pack/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/deprecation/resource_pack/inspec.yml
rename to test/fixtures/profiles/deprecation/resource_pack/inspec.yml
diff --git a/test/unit/mock/profiles/deprecation/resource_pack/libraries/deprecation_tester.rb b/test/fixtures/profiles/deprecation/resource_pack/libraries/deprecation_tester.rb
similarity index 100%
rename from test/unit/mock/profiles/deprecation/resource_pack/libraries/deprecation_tester.rb
rename to test/fixtures/profiles/deprecation/resource_pack/libraries/deprecation_tester.rb
diff --git a/test/unit/mock/profiles/deprecation/typical/README.md b/test/fixtures/profiles/deprecation/typical/README.md
similarity index 100%
rename from test/unit/mock/profiles/deprecation/typical/README.md
rename to test/fixtures/profiles/deprecation/typical/README.md
diff --git a/test/unit/mock/profiles/deprecation/typical/controls/typical.rb b/test/fixtures/profiles/deprecation/typical/controls/typical.rb
similarity index 100%
rename from test/unit/mock/profiles/deprecation/typical/controls/typical.rb
rename to test/fixtures/profiles/deprecation/typical/controls/typical.rb
diff --git a/test/unit/mock/profiles/deprecation/typical/inspec.yml b/test/fixtures/profiles/deprecation/typical/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/deprecation/typical/inspec.yml
rename to test/fixtures/profiles/deprecation/typical/inspec.yml
diff --git a/test/unit/mock/profiles/dsl_plugins/controls/control_dsl.rb b/test/fixtures/profiles/dsl_plugins/controls/control_dsl.rb
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/controls/control_dsl.rb
rename to test/fixtures/profiles/dsl_plugins/controls/control_dsl.rb
diff --git a/test/unit/mock/profiles/dsl_plugins/controls/describe_dsl.rb b/test/fixtures/profiles/dsl_plugins/controls/describe_dsl.rb
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/controls/describe_dsl.rb
rename to test/fixtures/profiles/dsl_plugins/controls/describe_dsl.rb
diff --git a/test/unit/mock/profiles/dsl_plugins/controls/outer_profile_dsl.rb b/test/fixtures/profiles/dsl_plugins/controls/outer_profile_dsl.rb
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/controls/outer_profile_dsl.rb
rename to test/fixtures/profiles/dsl_plugins/controls/outer_profile_dsl.rb
diff --git a/test/unit/mock/profiles/dsl_plugins/controls/resource_dsl.rb b/test/fixtures/profiles/dsl_plugins/controls/resource_dsl.rb
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/controls/resource_dsl.rb
rename to test/fixtures/profiles/dsl_plugins/controls/resource_dsl.rb
diff --git a/test/unit/mock/profiles/dsl_plugins/controls/test_dsl.rb b/test/fixtures/profiles/dsl_plugins/controls/test_dsl.rb
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/controls/test_dsl.rb
rename to test/fixtures/profiles/dsl_plugins/controls/test_dsl.rb
diff --git a/test/unit/mock/profiles/dsl_plugins/inspec.yml b/test/fixtures/profiles/dsl_plugins/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/inspec.yml
rename to test/fixtures/profiles/dsl_plugins/inspec.yml
diff --git a/test/unit/mock/profiles/dsl_plugins/libraries/favorite_berry_resource.rb b/test/fixtures/profiles/dsl_plugins/libraries/favorite_berry_resource.rb
similarity index 100%
rename from test/unit/mock/profiles/dsl_plugins/libraries/favorite_berry_resource.rb
rename to test/fixtures/profiles/dsl_plugins/libraries/favorite_berry_resource.rb
diff --git a/test/unit/mock/profiles/empty-metadata/inspec.yml b/test/fixtures/profiles/empty-metadata/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/empty-metadata/inspec.yml
rename to test/fixtures/profiles/empty-metadata/inspec.yml
diff --git a/test/unit/mock/profiles/exception-in-control/README.md b/test/fixtures/profiles/exception-in-control/README.md
similarity index 100%
rename from test/unit/mock/profiles/exception-in-control/README.md
rename to test/fixtures/profiles/exception-in-control/README.md
diff --git a/test/unit/mock/profiles/exception-in-control/controls/01-file.rb b/test/fixtures/profiles/exception-in-control/controls/01-file.rb
similarity index 100%
rename from test/unit/mock/profiles/exception-in-control/controls/01-file.rb
rename to test/fixtures/profiles/exception-in-control/controls/01-file.rb
diff --git a/test/unit/mock/profiles/exception-in-control/controls/02-sshd_config.rb b/test/fixtures/profiles/exception-in-control/controls/02-sshd_config.rb
similarity index 100%
rename from test/unit/mock/profiles/exception-in-control/controls/02-sshd_config.rb
rename to test/fixtures/profiles/exception-in-control/controls/02-sshd_config.rb
diff --git a/test/unit/mock/profiles/exception-in-control/controls/03-syntax.rb b/test/fixtures/profiles/exception-in-control/controls/03-syntax.rb
similarity index 100%
rename from test/unit/mock/profiles/exception-in-control/controls/03-syntax.rb
rename to test/fixtures/profiles/exception-in-control/controls/03-syntax.rb
diff --git a/test/unit/mock/profiles/exception-in-control/inspec.yml b/test/fixtures/profiles/exception-in-control/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/exception-in-control/inspec.yml
rename to test/fixtures/profiles/exception-in-control/inspec.yml
diff --git a/test/unit/mock/profiles/export-json/empty-wrapper/controls/includes.rb b/test/fixtures/profiles/export-json/empty-wrapper/controls/includes.rb
similarity index 100%
rename from test/unit/mock/profiles/export-json/empty-wrapper/controls/includes.rb
rename to test/fixtures/profiles/export-json/empty-wrapper/controls/includes.rb
diff --git a/test/unit/mock/profiles/export-json/empty-wrapper/inspec.yml b/test/fixtures/profiles/export-json/empty-wrapper/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/export-json/empty-wrapper/inspec.yml
rename to test/fixtures/profiles/export-json/empty-wrapper/inspec.yml
diff --git a/test/unit/mock/profiles/export-json/simple-profile/controls/basic.rb b/test/fixtures/profiles/export-json/simple-profile/controls/basic.rb
similarity index 100%
rename from test/unit/mock/profiles/export-json/simple-profile/controls/basic.rb
rename to test/fixtures/profiles/export-json/simple-profile/controls/basic.rb
diff --git a/test/unit/mock/profiles/export-json/simple-profile/inspec.yml b/test/fixtures/profiles/export-json/simple-profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/export-json/simple-profile/inspec.yml
rename to test/fixtures/profiles/export-json/simple-profile/inspec.yml
diff --git a/test/unit/mock/profiles/failures/controls/failures.rb b/test/fixtures/profiles/failures/controls/failures.rb
similarity index 100%
rename from test/unit/mock/profiles/failures/controls/failures.rb
rename to test/fixtures/profiles/failures/controls/failures.rb
diff --git a/test/unit/mock/profiles/failures/inspec.yml b/test/fixtures/profiles/failures/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/failures/inspec.yml
rename to test/fixtures/profiles/failures/inspec.yml
diff --git a/test/unit/mock/profiles/filter_table/controls/default_methods.rb b/test/fixtures/profiles/filter_table/controls/default_methods.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/controls/default_methods.rb
rename to test/fixtures/profiles/filter_table/controls/default_methods.rb
diff --git a/test/unit/mock/profiles/filter_table/controls/lazy_loading_columns.rb b/test/fixtures/profiles/filter_table/controls/lazy_loading_columns.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/controls/lazy_loading_columns.rb
rename to test/fixtures/profiles/filter_table/controls/lazy_loading_columns.rb
diff --git a/test/unit/mock/profiles/filter_table/controls/no_internals_in_raw_data.rb b/test/fixtures/profiles/filter_table/controls/no_internals_in_raw_data.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/controls/no_internals_in_raw_data.rb
rename to test/fixtures/profiles/filter_table/controls/no_internals_in_raw_data.rb
diff --git a/test/unit/mock/profiles/filter_table/controls/validate_criteria_as_params.rb b/test/fixtures/profiles/filter_table/controls/validate_criteria_as_params.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/controls/validate_criteria_as_params.rb
rename to test/fixtures/profiles/filter_table/controls/validate_criteria_as_params.rb
diff --git a/test/unit/mock/profiles/filter_table/controls/where_exception_on_trace.rb b/test/fixtures/profiles/filter_table/controls/where_exception_on_trace.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/controls/where_exception_on_trace.rb
rename to test/fixtures/profiles/filter_table/controls/where_exception_on_trace.rb
diff --git a/test/unit/mock/profiles/filter_table/controls/where_iteration.rb b/test/fixtures/profiles/filter_table/controls/where_iteration.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/controls/where_iteration.rb
rename to test/fixtures/profiles/filter_table/controls/where_iteration.rb
diff --git a/test/unit/mock/profiles/filter_table/inspec.yml b/test/fixtures/profiles/filter_table/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/filter_table/inspec.yml
rename to test/fixtures/profiles/filter_table/inspec.yml
diff --git a/test/unit/mock/profiles/filter_table/libraries/default_methods_demo.rb b/test/fixtures/profiles/filter_table/libraries/default_methods_demo.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/libraries/default_methods_demo.rb
rename to test/fixtures/profiles/filter_table/libraries/default_methods_demo.rb
diff --git a/test/unit/mock/profiles/filter_table/libraries/lazy_loader.rb b/test/fixtures/profiles/filter_table/libraries/lazy_loader.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/libraries/lazy_loader.rb
rename to test/fixtures/profiles/filter_table/libraries/lazy_loader.rb
diff --git a/test/unit/mock/profiles/filter_table/libraries/simple_plural.rb b/test/fixtures/profiles/filter_table/libraries/simple_plural.rb
similarity index 100%
rename from test/unit/mock/profiles/filter_table/libraries/simple_plural.rb
rename to test/fixtures/profiles/filter_table/libraries/simple_plural.rb
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/README.md b/test/fixtures/profiles/git-fetcher/basic-local/README.md
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/README.md
rename to test/fixtures/profiles/git-fetcher/basic-local/README.md
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/controls/basic-local.rb b/test/fixtures/profiles/git-fetcher/basic-local/controls/basic-local.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/controls/basic-local.rb
rename to test/fixtures/profiles/git-fetcher/basic-local/controls/basic-local.rb
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/COMMIT_EDITMSG b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/COMMIT_EDITMSG
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/COMMIT_EDITMSG
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/COMMIT_EDITMSG
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/HEAD b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/HEAD
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/HEAD
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/HEAD
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/config b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/config
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/config
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/config
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/description b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/description
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/description
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/description
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/index b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/index
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/index
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/index
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/info/exclude b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/info/exclude
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/info/exclude
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/info/exclude
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/logs/HEAD b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/logs/HEAD
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/logs/HEAD
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/logs/HEAD
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/master b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/master
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/master
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/master
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/test-branch b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/test-branch
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/test-branch
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/logs/refs/heads/test-branch
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/02/145c02bed66651584950fd3c56a0f8e08495ad b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/02/145c02bed66651584950fd3c56a0f8e08495ad
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/02/145c02bed66651584950fd3c56a0f8e08495ad
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/02/145c02bed66651584950fd3c56a0f8e08495ad
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/0e/7d2b9c2c5a1372341e36febceab86558439149 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/0e/7d2b9c2c5a1372341e36febceab86558439149
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/0e/7d2b9c2c5a1372341e36febceab86558439149
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/0e/7d2b9c2c5a1372341e36febceab86558439149
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/26/dec4a490f980527c06528510ed85512fd55e10 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/26/dec4a490f980527c06528510ed85512fd55e10
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/26/dec4a490f980527c06528510ed85512fd55e10
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/26/dec4a490f980527c06528510ed85512fd55e10
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/38/b63f30119439953105a30b6b54201ccdf161ad b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/38/b63f30119439953105a30b6b54201ccdf161ad
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/38/b63f30119439953105a30b6b54201ccdf161ad
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/38/b63f30119439953105a30b6b54201ccdf161ad
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/53/7a2ff34c95a18643627a95ae39b1af3f645346 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/53/7a2ff34c95a18643627a95ae39b1af3f645346
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/53/7a2ff34c95a18643627a95ae39b1af3f645346
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/53/7a2ff34c95a18643627a95ae39b1af3f645346
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/54/d0671d3e2c4a28865a0ecc98863859bd4d7475 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/54/d0671d3e2c4a28865a0ecc98863859bd4d7475
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/54/d0671d3e2c4a28865a0ecc98863859bd4d7475
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/54/d0671d3e2c4a28865a0ecc98863859bd4d7475
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/b7/b45291b2ed5c7885e355f12dd8da6bcd6c2437 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/b7/b45291b2ed5c7885e355f12dd8da6bcd6c2437
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/b7/b45291b2ed5c7885e355f12dd8da6bcd6c2437
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/b7/b45291b2ed5c7885e355f12dd8da6bcd6c2437
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/d4/7c4fc2bd4c7e35dc5e1f40885335cc63bcd241 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/d4/7c4fc2bd4c7e35dc5e1f40885335cc63bcd241
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/d4/7c4fc2bd4c7e35dc5e1f40885335cc63bcd241
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/d4/7c4fc2bd4c7e35dc5e1f40885335cc63bcd241
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/ea/56cd2cd0923474011fb248a3cd3c2a18585b5f b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/ea/56cd2cd0923474011fb248a3cd3c2a18585b5f
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/objects/ea/56cd2cd0923474011fb248a3cd3c2a18585b5f
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/objects/ea/56cd2cd0923474011fb248a3cd3c2a18585b5f
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/refs/heads/master b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/refs/heads/master
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/refs/heads/master
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/refs/heads/master
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/refs/heads/test-branch b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/refs/heads/test-branch
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/refs/heads/test-branch
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/refs/heads/test-branch
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/refs/tags/v1.0 b/test/fixtures/profiles/git-fetcher/basic-local/git-fixture/refs/tags/v1.0
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/git-fixture/refs/tags/v1.0
rename to test/fixtures/profiles/git-fetcher/basic-local/git-fixture/refs/tags/v1.0
diff --git a/test/unit/mock/profiles/git-fetcher/basic-local/inspec.yml b/test/fixtures/profiles/git-fetcher/basic-local/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic-local/inspec.yml
rename to test/fixtures/profiles/git-fetcher/basic-local/inspec.yml
diff --git a/test/unit/mock/profiles/git-fetcher/basic/inspec.yml b/test/fixtures/profiles/git-fetcher/basic/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/basic/inspec.yml
rename to test/fixtures/profiles/git-fetcher/basic/inspec.yml
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/README.md b/test/fixtures/profiles/git-fetcher/git-repo-01/README.md
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/README.md
rename to test/fixtures/profiles/git-fetcher/git-repo-01/README.md
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/child-01/controls/child-01.rb b/test/fixtures/profiles/git-fetcher/git-repo-01/child-01/controls/child-01.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/child-01/controls/child-01.rb
rename to test/fixtures/profiles/git-fetcher/git-repo-01/child-01/controls/child-01.rb
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/child-01/inspec.yml b/test/fixtures/profiles/git-fetcher/git-repo-01/child-01/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/child-01/inspec.yml
rename to test/fixtures/profiles/git-fetcher/git-repo-01/child-01/inspec.yml
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/controls/red-dye.rb b/test/fixtures/profiles/git-fetcher/git-repo-01/controls/red-dye.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/controls/red-dye.rb
rename to test/fixtures/profiles/git-fetcher/git-repo-01/controls/red-dye.rb
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/controls/child-02.rb b/test/fixtures/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/controls/child-02.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/controls/child-02.rb
rename to test/fixtures/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/controls/child-02.rb
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/inspec.yml b/test/fixtures/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/inspec.yml
rename to test/fixtures/profiles/git-fetcher/git-repo-01/deeper-path/in/repo/child-02/inspec.yml
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/COMMIT_EDITMSG b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/COMMIT_EDITMSG
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/COMMIT_EDITMSG
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/COMMIT_EDITMSG
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/HEAD b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/HEAD
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/HEAD
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/HEAD
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/config b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/config
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/config
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/config
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/description b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/description
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/description
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/description
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/index b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/index
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/index
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/index
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/info/exclude b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/info/exclude
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/info/exclude
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/info/exclude
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/logs/HEAD b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/logs/HEAD
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/logs/HEAD
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/logs/HEAD
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/logs/refs/heads/master b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/logs/refs/heads/master
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/logs/refs/heads/master
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/logs/refs/heads/master
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/0c/0abc0b6dc094bf6756b369db878c69f11839c5 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/0c/0abc0b6dc094bf6756b369db878c69f11839c5
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/0c/0abc0b6dc094bf6756b369db878c69f11839c5
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/0c/0abc0b6dc094bf6756b369db878c69f11839c5
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/16/d0355317bef35f2dc7e71607b5e6df7c812713 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/16/d0355317bef35f2dc7e71607b5e6df7c812713
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/16/d0355317bef35f2dc7e71607b5e6df7c812713
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/16/d0355317bef35f2dc7e71607b5e6df7c812713
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/36/f4c4ecd2b870c0d0869c14a3e41dd506e5a887 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/36/f4c4ecd2b870c0d0869c14a3e41dd506e5a887
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/36/f4c4ecd2b870c0d0869c14a3e41dd506e5a887
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/36/f4c4ecd2b870c0d0869c14a3e41dd506e5a887
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/3d/06a6c531116e47438e0009be37aad4c19eeec1 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/3d/06a6c531116e47438e0009be37aad4c19eeec1
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/3d/06a6c531116e47438e0009be37aad4c19eeec1
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/3d/06a6c531116e47438e0009be37aad4c19eeec1
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/4e/45530f8d46d447cba28d4a41e55cd5b06c0f72 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/4e/45530f8d46d447cba28d4a41e55cd5b06c0f72
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/4e/45530f8d46d447cba28d4a41e55cd5b06c0f72
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/4e/45530f8d46d447cba28d4a41e55cd5b06c0f72
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/65/dcdc3491c0c138538379f404f2517d968282a7 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/65/dcdc3491c0c138538379f404f2517d968282a7
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/65/dcdc3491c0c138538379f404f2517d968282a7
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/65/dcdc3491c0c138538379f404f2517d968282a7
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/74/198b01ae86430df0149b4389f112f6a94ba47d b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/74/198b01ae86430df0149b4389f112f6a94ba47d
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/74/198b01ae86430df0149b4389f112f6a94ba47d
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/74/198b01ae86430df0149b4389f112f6a94ba47d
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/87/da758286290d2ec7de5d0a748b4db7a5c4eff5 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/87/da758286290d2ec7de5d0a748b4db7a5c4eff5
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/87/da758286290d2ec7de5d0a748b4db7a5c4eff5
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/87/da758286290d2ec7de5d0a748b4db7a5c4eff5
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/a6/a86bbacc7daf98fb1155a7ebfca37164f8873f b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/a6/a86bbacc7daf98fb1155a7ebfca37164f8873f
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/a6/a86bbacc7daf98fb1155a7ebfca37164f8873f
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/a6/a86bbacc7daf98fb1155a7ebfca37164f8873f
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/b7/923d86b8b8951df0eee505671907a59410a978 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/b7/923d86b8b8951df0eee505671907a59410a978
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/b7/923d86b8b8951df0eee505671907a59410a978
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/b7/923d86b8b8951df0eee505671907a59410a978
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/df/e8db2e9636f83a29b42d790c4061f08da60ccd b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/df/e8db2e9636f83a29b42d790c4061f08da60ccd
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/df/e8db2e9636f83a29b42d790c4061f08da60ccd
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/df/e8db2e9636f83a29b42d790c4061f08da60ccd
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/e0/a79951d85e314d4f091201bceaeab5001ea8e9 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/e0/a79951d85e314d4f091201bceaeab5001ea8e9
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/e0/a79951d85e314d4f091201bceaeab5001ea8e9
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/e0/a79951d85e314d4f091201bceaeab5001ea8e9
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/e6/d4da70d17f77ab9276a448633b69de7d253f39 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/e6/d4da70d17f77ab9276a448633b69de7d253f39
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/e6/d4da70d17f77ab9276a448633b69de7d253f39
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/e6/d4da70d17f77ab9276a448633b69de7d253f39
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/e9/dd6fd217cced2639b2ad64319bfd73b28a413a b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/e9/dd6fd217cced2639b2ad64319bfd73b28a413a
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/e9/dd6fd217cced2639b2ad64319bfd73b28a413a
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/e9/dd6fd217cced2639b2ad64319bfd73b28a413a
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/ff/13d726419b64726a7ef787377367d598cbb509 b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/ff/13d726419b64726a7ef787377367d598cbb509
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/objects/ff/13d726419b64726a7ef787377367d598cbb509
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/objects/ff/13d726419b64726a7ef787377367d598cbb509
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/refs/heads/master b/test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/refs/heads/master
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/git-fixture/refs/heads/master
rename to test/fixtures/profiles/git-fetcher/git-repo-01/git-fixture/refs/heads/master
diff --git a/test/unit/mock/profiles/git-fetcher/git-repo-01/inspec.yml b/test/fixtures/profiles/git-fetcher/git-repo-01/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/git-repo-01/inspec.yml
rename to test/fixtures/profiles/git-fetcher/git-repo-01/inspec.yml
diff --git a/test/unit/mock/profiles/git-fetcher/relative-combo/controls/relative-combo.rb b/test/fixtures/profiles/git-fetcher/relative-combo/controls/relative-combo.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/relative-combo/controls/relative-combo.rb
rename to test/fixtures/profiles/git-fetcher/relative-combo/controls/relative-combo.rb
diff --git a/test/unit/mock/profiles/git-fetcher/relative-combo/inspec.yml b/test/fixtures/profiles/git-fetcher/relative-combo/inspec.yml
similarity index 72%
rename from test/unit/mock/profiles/git-fetcher/relative-combo/inspec.yml
rename to test/fixtures/profiles/git-fetcher/relative-combo/inspec.yml
index 30fe852bd..7cea49941 100644
--- a/test/unit/mock/profiles/git-fetcher/relative-combo/inspec.yml
+++ b/test/fixtures/profiles/git-fetcher/relative-combo/inspec.yml
@@ -7,8 +7,8 @@ supports:
   platform: os
 depends:
 - name: child-01
-  git: test/unit/mock/profiles/git-fetcher/git-repo-01
+  git: test/fixtures/profiles/git-fetcher/git-repo-01
   relative_path: child-01
 - name: child-02
-  git: test/unit/mock/profiles/git-fetcher/git-repo-01
+  git: test/fixtures/profiles/git-fetcher/git-repo-01
   relative_path: deeper-path/in/repo/child-02
diff --git a/test/unit/mock/profiles/git-fetcher/relative-deep/controls/relative-deep.rb b/test/fixtures/profiles/git-fetcher/relative-deep/controls/relative-deep.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/relative-deep/controls/relative-deep.rb
rename to test/fixtures/profiles/git-fetcher/relative-deep/controls/relative-deep.rb
diff --git a/test/unit/mock/profiles/git-fetcher/relative-deep/inspec.yml b/test/fixtures/profiles/git-fetcher/relative-deep/inspec.yml
similarity index 81%
rename from test/unit/mock/profiles/git-fetcher/relative-deep/inspec.yml
rename to test/fixtures/profiles/git-fetcher/relative-deep/inspec.yml
index 17e0bca05..e46e3f1ef 100644
--- a/test/unit/mock/profiles/git-fetcher/relative-deep/inspec.yml
+++ b/test/fixtures/profiles/git-fetcher/relative-deep/inspec.yml
@@ -7,5 +7,5 @@ supports:
   platform: os
 depends:
 - name: child-02
-  git: test/unit/mock/profiles/git-fetcher/git-repo-01
+  git: test/fixtures/profiles/git-fetcher/git-repo-01
   relative_path: deeper-path/in/repo/child-02
diff --git a/test/unit/mock/profiles/git-fetcher/relative-dot-slash/controls/relative-dot-slash.rb b/test/fixtures/profiles/git-fetcher/relative-dot-slash/controls/relative-dot-slash.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/relative-dot-slash/controls/relative-dot-slash.rb
rename to test/fixtures/profiles/git-fetcher/relative-dot-slash/controls/relative-dot-slash.rb
diff --git a/test/unit/mock/profiles/git-fetcher/relative-dot-slash/inspec.yml b/test/fixtures/profiles/git-fetcher/relative-dot-slash/inspec.yml
similarity index 80%
rename from test/unit/mock/profiles/git-fetcher/relative-dot-slash/inspec.yml
rename to test/fixtures/profiles/git-fetcher/relative-dot-slash/inspec.yml
index 1dc08f6c0..ab9903617 100644
--- a/test/unit/mock/profiles/git-fetcher/relative-dot-slash/inspec.yml
+++ b/test/fixtures/profiles/git-fetcher/relative-dot-slash/inspec.yml
@@ -7,5 +7,5 @@ supports:
   platform: os
 depends:
 - name: basic-local
-  git: test/unit/mock/profiles/git-fetcher/basic-local
+  git: test/fixtures/profiles/git-fetcher/basic-local
   relative_path: ./
diff --git a/test/unit/mock/profiles/git-fetcher/relative-empty/controls/relative-empty.rb b/test/fixtures/profiles/git-fetcher/relative-empty/controls/relative-empty.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/relative-empty/controls/relative-empty.rb
rename to test/fixtures/profiles/git-fetcher/relative-empty/controls/relative-empty.rb
diff --git a/test/unit/mock/profiles/git-fetcher/relative-empty/inspec.yml b/test/fixtures/profiles/git-fetcher/relative-empty/inspec.yml
similarity index 80%
rename from test/unit/mock/profiles/git-fetcher/relative-empty/inspec.yml
rename to test/fixtures/profiles/git-fetcher/relative-empty/inspec.yml
index 418bcdeff..6b73c9f39 100644
--- a/test/unit/mock/profiles/git-fetcher/relative-empty/inspec.yml
+++ b/test/fixtures/profiles/git-fetcher/relative-empty/inspec.yml
@@ -7,5 +7,5 @@ supports:
   platform: os
 depends:
 - name: basic-local
-  git: test/unit/mock/profiles/git-fetcher/basic-local
+  git: test/fixtures/profiles/git-fetcher/basic-local
   relative_path: ''
diff --git a/test/unit/mock/profiles/git-fetcher/relative-nonesuch/controls/relative-nonesuch.rb b/test/fixtures/profiles/git-fetcher/relative-nonesuch/controls/relative-nonesuch.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/relative-nonesuch/controls/relative-nonesuch.rb
rename to test/fixtures/profiles/git-fetcher/relative-nonesuch/controls/relative-nonesuch.rb
diff --git a/test/unit/mock/profiles/git-fetcher/relative-nonesuch/inspec.yml b/test/fixtures/profiles/git-fetcher/relative-nonesuch/inspec.yml
similarity index 81%
rename from test/unit/mock/profiles/git-fetcher/relative-nonesuch/inspec.yml
rename to test/fixtures/profiles/git-fetcher/relative-nonesuch/inspec.yml
index fda4ee7e7..f9a144047 100644
--- a/test/unit/mock/profiles/git-fetcher/relative-nonesuch/inspec.yml
+++ b/test/fixtures/profiles/git-fetcher/relative-nonesuch/inspec.yml
@@ -7,5 +7,5 @@ supports:
   platform: os
 depends:
 - name: none-such-01
-  git: test/unit/mock/profiles/git-fetcher/git-repo-01
+  git: test/fixtures/profiles/git-fetcher/git-repo-01
   relative_path: no/such/path
diff --git a/test/unit/mock/profiles/git-fetcher/relative-shallow/controls/top-level.rb b/test/fixtures/profiles/git-fetcher/relative-shallow/controls/top-level.rb
similarity index 100%
rename from test/unit/mock/profiles/git-fetcher/relative-shallow/controls/top-level.rb
rename to test/fixtures/profiles/git-fetcher/relative-shallow/controls/top-level.rb
diff --git a/test/unit/mock/profiles/git-fetcher/relative-shallow/inspec.yml b/test/fixtures/profiles/git-fetcher/relative-shallow/inspec.yml
similarity index 81%
rename from test/unit/mock/profiles/git-fetcher/relative-shallow/inspec.yml
rename to test/fixtures/profiles/git-fetcher/relative-shallow/inspec.yml
index bee308f11..57fceb9e6 100644
--- a/test/unit/mock/profiles/git-fetcher/relative-shallow/inspec.yml
+++ b/test/fixtures/profiles/git-fetcher/relative-shallow/inspec.yml
@@ -7,5 +7,5 @@ supports:
   platform: os
 depends:
 - name: child-01
-  git: test/unit/mock/profiles/git-fetcher/git-repo-01
+  git: test/fixtures/profiles/git-fetcher/git-repo-01
   relative_path: child-01
diff --git a/test/unit/mock/profiles/incompatible_resource_for_transport.rb b/test/fixtures/profiles/incompatible_resource_for_transport.rb
similarity index 100%
rename from test/unit/mock/profiles/incompatible_resource_for_transport.rb
rename to test/fixtures/profiles/incompatible_resource_for_transport.rb
diff --git a/test/unit/mock/profiles/inputs/basic/controls/flat.rb b/test/fixtures/profiles/inputs/basic/controls/flat.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/basic/controls/flat.rb
rename to test/fixtures/profiles/inputs/basic/controls/flat.rb
diff --git a/test/unit/mock/profiles/inputs/basic/controls/nested.rb b/test/fixtures/profiles/inputs/basic/controls/nested.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/basic/controls/nested.rb
rename to test/fixtures/profiles/inputs/basic/controls/nested.rb
diff --git a/test/unit/mock/profiles/inputs/basic/files/flat.yaml b/test/fixtures/profiles/inputs/basic/files/flat.yaml
similarity index 100%
rename from test/unit/mock/profiles/inputs/basic/files/flat.yaml
rename to test/fixtures/profiles/inputs/basic/files/flat.yaml
diff --git a/test/unit/mock/profiles/inputs/basic/files/nested.yaml b/test/fixtures/profiles/inputs/basic/files/nested.yaml
similarity index 100%
rename from test/unit/mock/profiles/inputs/basic/files/nested.yaml
rename to test/fixtures/profiles/inputs/basic/files/nested.yaml
diff --git a/test/unit/mock/profiles/inputs/basic/inspec.yml b/test/fixtures/profiles/inputs/basic/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/basic/inspec.yml
rename to test/fixtures/profiles/inputs/basic/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/cli/controls/cli.rb b/test/fixtures/profiles/inputs/cli/controls/cli.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/cli/controls/cli.rb
rename to test/fixtures/profiles/inputs/cli/controls/cli.rb
diff --git a/test/unit/mock/profiles/inputs/cli/inspec.yml b/test/fixtures/profiles/inputs/cli/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/cli/inspec.yml
rename to test/fixtures/profiles/inputs/cli/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/describe-one/controls/describe-one.rb b/test/fixtures/profiles/inputs/describe-one/controls/describe-one.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/describe-one/controls/describe-one.rb
rename to test/fixtures/profiles/inputs/describe-one/controls/describe-one.rb
diff --git a/test/unit/mock/profiles/inputs/describe-one/inspec.yml b/test/fixtures/profiles/inputs/describe-one/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/describe-one/inspec.yml
rename to test/fixtures/profiles/inputs/describe-one/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/inheritance/child-01/controls/child-01-controls.rb b/test/fixtures/profiles/inputs/inheritance/child-01/controls/child-01-controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/inheritance/child-01/controls/child-01-controls.rb
rename to test/fixtures/profiles/inputs/inheritance/child-01/controls/child-01-controls.rb
diff --git a/test/unit/mock/profiles/inputs/inheritance/child-01/inspec.yml b/test/fixtures/profiles/inputs/inheritance/child-01/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/inheritance/child-01/inspec.yml
rename to test/fixtures/profiles/inputs/inheritance/child-01/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/inheritance/child-02/controls/child-02-controls.rb b/test/fixtures/profiles/inputs/inheritance/child-02/controls/child-02-controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/inheritance/child-02/controls/child-02-controls.rb
rename to test/fixtures/profiles/inputs/inheritance/child-02/controls/child-02-controls.rb
diff --git a/test/unit/mock/profiles/inputs/inheritance/child-02/inspec.yml b/test/fixtures/profiles/inputs/inheritance/child-02/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/inheritance/child-02/inspec.yml
rename to test/fixtures/profiles/inputs/inheritance/child-02/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/inheritance/wrapper/controls/wrapper-controls.rb b/test/fixtures/profiles/inputs/inheritance/wrapper/controls/wrapper-controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/inheritance/wrapper/controls/wrapper-controls.rb
rename to test/fixtures/profiles/inputs/inheritance/wrapper/controls/wrapper-controls.rb
diff --git a/test/unit/mock/profiles/inputs/inheritance/wrapper/inspec.yml b/test/fixtures/profiles/inputs/inheritance/wrapper/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/inheritance/wrapper/inspec.yml
rename to test/fixtures/profiles/inputs/inheritance/wrapper/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/legacy-attributes-dsl/controls/legacy-dsl.rb b/test/fixtures/profiles/inputs/legacy-attributes-dsl/controls/legacy-dsl.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/legacy-attributes-dsl/controls/legacy-dsl.rb
rename to test/fixtures/profiles/inputs/legacy-attributes-dsl/controls/legacy-dsl.rb
diff --git a/test/unit/mock/profiles/inputs/legacy-attributes-dsl/inspec.yml b/test/fixtures/profiles/inputs/legacy-attributes-dsl/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/legacy-attributes-dsl/inspec.yml
rename to test/fixtures/profiles/inputs/legacy-attributes-dsl/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/metadata-basic/controls/metadata_controls.rb b/test/fixtures/profiles/inputs/metadata-basic/controls/metadata_controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-basic/controls/metadata_controls.rb
rename to test/fixtures/profiles/inputs/metadata-basic/controls/metadata_controls.rb
diff --git a/test/unit/mock/profiles/inputs/metadata-basic/inspec.yml b/test/fixtures/profiles/inputs/metadata-basic/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-basic/inspec.yml
rename to test/fixtures/profiles/inputs/metadata-basic/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/metadata-empty/inspec.yml b/test/fixtures/profiles/inputs/metadata-empty/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-empty/inspec.yml
rename to test/fixtures/profiles/inputs/metadata-empty/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/metadata-invalid/inspec.yml b/test/fixtures/profiles/inputs/metadata-invalid/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-invalid/inspec.yml
rename to test/fixtures/profiles/inputs/metadata-invalid/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/metadata-legacy/controls/metadata_controls.rb b/test/fixtures/profiles/inputs/metadata-legacy/controls/metadata_controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-legacy/controls/metadata_controls.rb
rename to test/fixtures/profiles/inputs/metadata-legacy/controls/metadata_controls.rb
diff --git a/test/unit/mock/profiles/inputs/metadata-legacy/inspec.yml b/test/fixtures/profiles/inputs/metadata-legacy/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-legacy/inspec.yml
rename to test/fixtures/profiles/inputs/metadata-legacy/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/metadata-required/controls/mention-required.rb b/test/fixtures/profiles/inputs/metadata-required/controls/mention-required.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-required/controls/mention-required.rb
rename to test/fixtures/profiles/inputs/metadata-required/controls/mention-required.rb
diff --git a/test/unit/mock/profiles/inputs/metadata-required/inspec.yml b/test/fixtures/profiles/inputs/metadata-required/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/metadata-required/inspec.yml
rename to test/fixtures/profiles/inputs/metadata-required/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/plugin/controls/plugin_controls.rb b/test/fixtures/profiles/inputs/plugin/controls/plugin_controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/plugin/controls/plugin_controls.rb
rename to test/fixtures/profiles/inputs/plugin/controls/plugin_controls.rb
diff --git a/test/unit/mock/profiles/inputs/plugin/inspec.yml b/test/fixtures/profiles/inputs/plugin/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/plugin/inspec.yml
rename to test/fixtures/profiles/inputs/plugin/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/scoping/controls/scoping-controls.rb b/test/fixtures/profiles/inputs/scoping/controls/scoping-controls.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/scoping/controls/scoping-controls.rb
rename to test/fixtures/profiles/inputs/scoping/controls/scoping-controls.rb
diff --git a/test/unit/mock/profiles/inputs/scoping/inspec.yml b/test/fixtures/profiles/inputs/scoping/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/scoping/inspec.yml
rename to test/fixtures/profiles/inputs/scoping/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/undeclared/controls/undeclared.rb b/test/fixtures/profiles/inputs/undeclared/controls/undeclared.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/undeclared/controls/undeclared.rb
rename to test/fixtures/profiles/inputs/undeclared/controls/undeclared.rb
diff --git a/test/unit/mock/profiles/inputs/undeclared/inspec.yml b/test/fixtures/profiles/inputs/undeclared/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/undeclared/inspec.yml
rename to test/fixtures/profiles/inputs/undeclared/inspec.yml
diff --git a/test/unit/mock/profiles/inputs/via-runner/controls/via-runner.rb b/test/fixtures/profiles/inputs/via-runner/controls/via-runner.rb
similarity index 100%
rename from test/unit/mock/profiles/inputs/via-runner/controls/via-runner.rb
rename to test/fixtures/profiles/inputs/via-runner/controls/via-runner.rb
diff --git a/test/unit/mock/profiles/inputs/via-runner/inspec.yml b/test/fixtures/profiles/inputs/via-runner/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/inputs/via-runner/inspec.yml
rename to test/fixtures/profiles/inputs/via-runner/inspec.yml
diff --git a/test/unit/mock/profiles/invalid-include-controls/controls/example.rb b/test/fixtures/profiles/invalid-include-controls/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/invalid-include-controls/controls/example.rb
rename to test/fixtures/profiles/invalid-include-controls/controls/example.rb
diff --git a/test/unit/mock/profiles/invalid-include-controls/inspec.yml b/test/fixtures/profiles/invalid-include-controls/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/invalid-include-controls/inspec.yml
rename to test/fixtures/profiles/invalid-include-controls/inspec.yml
diff --git a/test/unit/mock/profiles/invalid-version/inspec.yml b/test/fixtures/profiles/invalid-version/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/invalid-version/inspec.yml
rename to test/fixtures/profiles/invalid-version/inspec.yml
diff --git a/test/unit/mock/profiles/library/controls/filesystem_spec.rb b/test/fixtures/profiles/library/controls/filesystem_spec.rb
similarity index 100%
rename from test/unit/mock/profiles/library/controls/filesystem_spec.rb
rename to test/fixtures/profiles/library/controls/filesystem_spec.rb
diff --git a/test/unit/mock/profiles/library/inspec.yml b/test/fixtures/profiles/library/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/library/inspec.yml
rename to test/fixtures/profiles/library/inspec.yml
diff --git a/test/unit/mock/profiles/library/libraries/examplelib.rb b/test/fixtures/profiles/library/libraries/examplelib.rb
similarity index 100%
rename from test/unit/mock/profiles/library/libraries/examplelib.rb
rename to test/fixtures/profiles/library/libraries/examplelib.rb
diff --git a/test/unit/mock/profiles/library/libraries/testlib.rb b/test/fixtures/profiles/library/libraries/testlib.rb
similarity index 100%
rename from test/unit/mock/profiles/library/libraries/testlib.rb
rename to test/fixtures/profiles/library/libraries/testlib.rb
diff --git a/test/unit/mock/profiles/license-invalid/inspec.yml b/test/fixtures/profiles/license-invalid/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/license-invalid/inspec.yml
rename to test/fixtures/profiles/license-invalid/inspec.yml
diff --git a/test/unit/mock/profiles/license-proprietary/inspec.yml b/test/fixtures/profiles/license-proprietary/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/license-proprietary/inspec.yml
rename to test/fixtures/profiles/license-proprietary/inspec.yml
diff --git a/test/unit/mock/profiles/license-spdx/inspec.yml b/test/fixtures/profiles/license-spdx/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/license-spdx/inspec.yml
rename to test/fixtures/profiles/license-spdx/inspec.yml
diff --git a/test/unit/mock/profiles/local-depends/inspec.yml b/test/fixtures/profiles/local-depends/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/local-depends/inspec.yml
rename to test/fixtures/profiles/local-depends/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/custom-resource/README.md b/test/fixtures/profiles/old-examples/custom-resource/README.md
similarity index 100%
rename from test/unit/mock/profiles/old-examples/custom-resource/README.md
rename to test/fixtures/profiles/old-examples/custom-resource/README.md
diff --git a/test/unit/mock/profiles/old-examples/custom-resource/controls/example.rb b/test/fixtures/profiles/old-examples/custom-resource/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/custom-resource/controls/example.rb
rename to test/fixtures/profiles/old-examples/custom-resource/controls/example.rb
diff --git a/test/unit/mock/profiles/old-examples/custom-resource/inspec.yml b/test/fixtures/profiles/old-examples/custom-resource/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/custom-resource/inspec.yml
rename to test/fixtures/profiles/old-examples/custom-resource/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/custom-resource/libraries/batsignal.rb b/test/fixtures/profiles/old-examples/custom-resource/libraries/batsignal.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/custom-resource/libraries/batsignal.rb
rename to test/fixtures/profiles/old-examples/custom-resource/libraries/batsignal.rb
diff --git a/test/unit/mock/profiles/old-examples/custom-resource/libraries/example.rb b/test/fixtures/profiles/old-examples/custom-resource/libraries/example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/custom-resource/libraries/example.rb
rename to test/fixtures/profiles/old-examples/custom-resource/libraries/example.rb
diff --git a/test/unit/mock/profiles/old-examples/inheritance/README.md b/test/fixtures/profiles/old-examples/inheritance/README.md
similarity index 100%
rename from test/unit/mock/profiles/old-examples/inheritance/README.md
rename to test/fixtures/profiles/old-examples/inheritance/README.md
diff --git a/test/unit/mock/profiles/old-examples/inheritance/controls/example.rb b/test/fixtures/profiles/old-examples/inheritance/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/inheritance/controls/example.rb
rename to test/fixtures/profiles/old-examples/inheritance/controls/example.rb
diff --git a/test/unit/mock/profiles/old-examples/inheritance/inspec.yml b/test/fixtures/profiles/old-examples/inheritance/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/inheritance/inspec.yml
rename to test/fixtures/profiles/old-examples/inheritance/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/meta-profile/README.md b/test/fixtures/profiles/old-examples/meta-profile/README.md
similarity index 100%
rename from test/unit/mock/profiles/old-examples/meta-profile/README.md
rename to test/fixtures/profiles/old-examples/meta-profile/README.md
diff --git a/test/unit/mock/profiles/old-examples/meta-profile/controls/example.rb b/test/fixtures/profiles/old-examples/meta-profile/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/meta-profile/controls/example.rb
rename to test/fixtures/profiles/old-examples/meta-profile/controls/example.rb
diff --git a/test/unit/mock/profiles/old-examples/meta-profile/inspec.yml b/test/fixtures/profiles/old-examples/meta-profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/meta-profile/inspec.yml
rename to test/fixtures/profiles/old-examples/meta-profile/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/profile-attribute.yml b/test/fixtures/profiles/old-examples/profile-attribute.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-attribute.yml
rename to test/fixtures/profiles/old-examples/profile-attribute.yml
diff --git a/test/unit/mock/profiles/old-examples/profile-attribute/README.md b/test/fixtures/profiles/old-examples/profile-attribute/README.md
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-attribute/README.md
rename to test/fixtures/profiles/old-examples/profile-attribute/README.md
diff --git a/test/unit/mock/profiles/old-examples/profile-attribute/controls/example.rb b/test/fixtures/profiles/old-examples/profile-attribute/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-attribute/controls/example.rb
rename to test/fixtures/profiles/old-examples/profile-attribute/controls/example.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-attribute/inspec.yml b/test/fixtures/profiles/old-examples/profile-attribute/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-attribute/inspec.yml
rename to test/fixtures/profiles/old-examples/profile-attribute/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/profile-aws/controls/iam_password_policy_expiration.rb b/test/fixtures/profiles/old-examples/profile-aws/controls/iam_password_policy_expiration.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-aws/controls/iam_password_policy_expiration.rb
rename to test/fixtures/profiles/old-examples/profile-aws/controls/iam_password_policy_expiration.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-aws/controls/iam_password_policy_max_age.rb b/test/fixtures/profiles/old-examples/profile-aws/controls/iam_password_policy_max_age.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-aws/controls/iam_password_policy_max_age.rb
rename to test/fixtures/profiles/old-examples/profile-aws/controls/iam_password_policy_max_age.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-aws/controls/iam_root_user_mfa.rb b/test/fixtures/profiles/old-examples/profile-aws/controls/iam_root_user_mfa.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-aws/controls/iam_root_user_mfa.rb
rename to test/fixtures/profiles/old-examples/profile-aws/controls/iam_root_user_mfa.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-aws/controls/iam_users_access_key_age.rb b/test/fixtures/profiles/old-examples/profile-aws/controls/iam_users_access_key_age.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-aws/controls/iam_users_access_key_age.rb
rename to test/fixtures/profiles/old-examples/profile-aws/controls/iam_users_access_key_age.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-aws/controls/iam_users_console_users_mfa.rb b/test/fixtures/profiles/old-examples/profile-aws/controls/iam_users_console_users_mfa.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-aws/controls/iam_users_console_users_mfa.rb
rename to test/fixtures/profiles/old-examples/profile-aws/controls/iam_users_console_users_mfa.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-aws/inspec.yml b/test/fixtures/profiles/old-examples/profile-aws/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-aws/inspec.yml
rename to test/fixtures/profiles/old-examples/profile-aws/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/profile-azure/controls/azure_resource_group_example.rb b/test/fixtures/profiles/old-examples/profile-azure/controls/azure_resource_group_example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-azure/controls/azure_resource_group_example.rb
rename to test/fixtures/profiles/old-examples/profile-azure/controls/azure_resource_group_example.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-azure/controls/azure_vm_example.rb b/test/fixtures/profiles/old-examples/profile-azure/controls/azure_vm_example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-azure/controls/azure_vm_example.rb
rename to test/fixtures/profiles/old-examples/profile-azure/controls/azure_vm_example.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-azure/inspec.yml b/test/fixtures/profiles/old-examples/profile-azure/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-azure/inspec.yml
rename to test/fixtures/profiles/old-examples/profile-azure/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/profile-sensitive/README.md b/test/fixtures/profiles/old-examples/profile-sensitive/README.md
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-sensitive/README.md
rename to test/fixtures/profiles/old-examples/profile-sensitive/README.md
diff --git a/test/unit/mock/profiles/old-examples/profile-sensitive/controls/sensitive-failures.rb b/test/fixtures/profiles/old-examples/profile-sensitive/controls/sensitive-failures.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-sensitive/controls/sensitive-failures.rb
rename to test/fixtures/profiles/old-examples/profile-sensitive/controls/sensitive-failures.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-sensitive/controls/sensitive.rb b/test/fixtures/profiles/old-examples/profile-sensitive/controls/sensitive.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-sensitive/controls/sensitive.rb
rename to test/fixtures/profiles/old-examples/profile-sensitive/controls/sensitive.rb
diff --git a/test/unit/mock/profiles/old-examples/profile-sensitive/inspec.yml b/test/fixtures/profiles/old-examples/profile-sensitive/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile-sensitive/inspec.yml
rename to test/fixtures/profiles/old-examples/profile-sensitive/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/profile/README.md b/test/fixtures/profiles/old-examples/profile/README.md
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile/README.md
rename to test/fixtures/profiles/old-examples/profile/README.md
diff --git a/test/unit/mock/profiles/old-examples/profile/controls/example-tmp.rb b/test/fixtures/profiles/old-examples/profile/controls/example-tmp.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile/controls/example-tmp.rb
rename to test/fixtures/profiles/old-examples/profile/controls/example-tmp.rb
diff --git a/test/unit/mock/profiles/old-examples/profile/controls/example.rb b/test/fixtures/profiles/old-examples/profile/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile/controls/example.rb
rename to test/fixtures/profiles/old-examples/profile/controls/example.rb
diff --git a/test/unit/mock/profiles/old-examples/profile/controls/meta.rb b/test/fixtures/profiles/old-examples/profile/controls/meta.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile/controls/meta.rb
rename to test/fixtures/profiles/old-examples/profile/controls/meta.rb
diff --git a/test/unit/mock/profiles/old-examples/profile/inspec.yml b/test/fixtures/profiles/old-examples/profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile/inspec.yml
rename to test/fixtures/profiles/old-examples/profile/inspec.yml
diff --git a/test/unit/mock/profiles/old-examples/profile/libraries/example_config.rb b/test/fixtures/profiles/old-examples/profile/libraries/example_config.rb
similarity index 100%
rename from test/unit/mock/profiles/old-examples/profile/libraries/example_config.rb
rename to test/fixtures/profiles/old-examples/profile/libraries/example_config.rb
diff --git a/test/unit/mock/profiles/only-if-os-nope/README.md b/test/fixtures/profiles/only-if-os-nope/README.md
similarity index 100%
rename from test/unit/mock/profiles/only-if-os-nope/README.md
rename to test/fixtures/profiles/only-if-os-nope/README.md
diff --git a/test/unit/mock/profiles/only-if-os-nope/controls/only-if-false.rb b/test/fixtures/profiles/only-if-os-nope/controls/only-if-false.rb
similarity index 100%
rename from test/unit/mock/profiles/only-if-os-nope/controls/only-if-false.rb
rename to test/fixtures/profiles/only-if-os-nope/controls/only-if-false.rb
diff --git a/test/unit/mock/profiles/only-if-os-nope/inspec.yml b/test/fixtures/profiles/only-if-os-nope/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/only-if-os-nope/inspec.yml
rename to test/fixtures/profiles/only-if-os-nope/inspec.yml
diff --git a/test/unit/mock/profiles/profile-lock-insync/inspec.lock b/test/fixtures/profiles/profile-lock-insync/inspec.lock
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-insync/inspec.lock
rename to test/fixtures/profiles/profile-lock-insync/inspec.lock
diff --git a/test/unit/mock/profiles/profile-lock-insync/inspec.yml b/test/fixtures/profiles/profile-lock-insync/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-insync/inspec.yml
rename to test/fixtures/profiles/profile-lock-insync/inspec.yml
diff --git a/test/unit/mock/profiles/profile-lock-insync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip b/test/fixtures/profiles/profile-lock-insync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-insync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip
rename to test/fixtures/profiles/profile-lock-insync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip
diff --git a/test/unit/mock/profiles/profile-lock-notrequired/inspec.yml b/test/fixtures/profiles/profile-lock-notrequired/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-notrequired/inspec.yml
rename to test/fixtures/profiles/profile-lock-notrequired/inspec.yml
diff --git a/test/unit/mock/profiles/profile-lock-outofsync/inspec.lock b/test/fixtures/profiles/profile-lock-outofsync/inspec.lock
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-outofsync/inspec.lock
rename to test/fixtures/profiles/profile-lock-outofsync/inspec.lock
diff --git a/test/unit/mock/profiles/profile-lock-outofsync/inspec.yml b/test/fixtures/profiles/profile-lock-outofsync/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-outofsync/inspec.yml
rename to test/fixtures/profiles/profile-lock-outofsync/inspec.yml
diff --git a/test/unit/mock/profiles/profile-lock-outofsync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip b/test/fixtures/profiles/profile-lock-outofsync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-outofsync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip
rename to test/fixtures/profiles/profile-lock-outofsync/vendor/f15d94086d07cb81d2a69b2b774135b1dbfd1c1918415aec7d266658aecfb47a.zip
diff --git a/test/unit/mock/profiles/profile-lock-required/inspec.yml b/test/fixtures/profiles/profile-lock-required/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-lock-required/inspec.yml
rename to test/fixtures/profiles/profile-lock-required/inspec.yml
diff --git a/test/unit/mock/profiles/profile-support-skip/controls/example.rb b/test/fixtures/profiles/profile-support-skip/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/profile-support-skip/controls/example.rb
rename to test/fixtures/profiles/profile-support-skip/controls/example.rb
diff --git a/test/unit/mock/profiles/profile-support-skip/inspec.yml b/test/fixtures/profiles/profile-support-skip/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-support-skip/inspec.yml
rename to test/fixtures/profiles/profile-support-skip/inspec.yml
diff --git a/test/unit/mock/profiles/profile-with-bad-metadata/controls/example.rb b/test/fixtures/profiles/profile-with-bad-metadata/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/profile-with-bad-metadata/controls/example.rb
rename to test/fixtures/profiles/profile-with-bad-metadata/controls/example.rb
diff --git a/test/unit/mock/profiles/profile-with-bad-metadata/inspec.yml b/test/fixtures/profiles/profile-with-bad-metadata/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-with-bad-metadata/inspec.yml
rename to test/fixtures/profiles/profile-with-bad-metadata/inspec.yml
diff --git a/test/unit/mock/profiles/profile-with-required-inputs/controls/include.rb b/test/fixtures/profiles/profile-with-required-inputs/controls/include.rb
similarity index 100%
rename from test/unit/mock/profiles/profile-with-required-inputs/controls/include.rb
rename to test/fixtures/profiles/profile-with-required-inputs/controls/include.rb
diff --git a/test/unit/mock/profiles/profile-with-required-inputs/inspec.yml b/test/fixtures/profiles/profile-with-required-inputs/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-with-required-inputs/inspec.yml
rename to test/fixtures/profiles/profile-with-required-inputs/inspec.yml
diff --git a/test/unit/mock/profiles/profile-with-resource-exceptions/README.md b/test/fixtures/profiles/profile-with-resource-exceptions/README.md
similarity index 100%
rename from test/unit/mock/profiles/profile-with-resource-exceptions/README.md
rename to test/fixtures/profiles/profile-with-resource-exceptions/README.md
diff --git a/test/unit/mock/profiles/profile-with-resource-exceptions/controls/exception_resource.rb b/test/fixtures/profiles/profile-with-resource-exceptions/controls/exception_resource.rb
similarity index 100%
rename from test/unit/mock/profiles/profile-with-resource-exceptions/controls/exception_resource.rb
rename to test/fixtures/profiles/profile-with-resource-exceptions/controls/exception_resource.rb
diff --git a/test/unit/mock/profiles/profile-with-resource-exceptions/inspec.yml b/test/fixtures/profiles/profile-with-resource-exceptions/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/profile-with-resource-exceptions/inspec.yml
rename to test/fixtures/profiles/profile-with-resource-exceptions/inspec.yml
diff --git a/test/unit/mock/profiles/profile-with-resource-exceptions/libraries/example_resource.rb b/test/fixtures/profiles/profile-with-resource-exceptions/libraries/example_resource.rb
similarity index 100%
rename from test/unit/mock/profiles/profile-with-resource-exceptions/libraries/example_resource.rb
rename to test/fixtures/profiles/profile-with-resource-exceptions/libraries/example_resource.rb
diff --git a/test/unit/mock/profiles/simple-inheritance/controls/simple-inheritance.rb b/test/fixtures/profiles/simple-inheritance/controls/simple-inheritance.rb
similarity index 100%
rename from test/unit/mock/profiles/simple-inheritance/controls/simple-inheritance.rb
rename to test/fixtures/profiles/simple-inheritance/controls/simple-inheritance.rb
diff --git a/test/unit/mock/profiles/simple-inheritance/inspec.yml b/test/fixtures/profiles/simple-inheritance/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/simple-inheritance/inspec.yml
rename to test/fixtures/profiles/simple-inheritance/inspec.yml
diff --git a/test/unit/mock/profiles/simple-metadata/inspec.yml b/test/fixtures/profiles/simple-metadata/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/simple-metadata/inspec.yml
rename to test/fixtures/profiles/simple-metadata/inspec.yml
diff --git a/test/unit/mock/profiles/skippy-controls/controls/skipper.rb b/test/fixtures/profiles/skippy-controls/controls/skipper.rb
similarity index 100%
rename from test/unit/mock/profiles/skippy-controls/controls/skipper.rb
rename to test/fixtures/profiles/skippy-controls/controls/skipper.rb
diff --git a/test/unit/mock/profiles/skippy-controls/inspec.yml b/test/fixtures/profiles/skippy-controls/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/skippy-controls/inspec.yml
rename to test/fixtures/profiles/skippy-controls/inspec.yml
diff --git a/test/unit/mock/profiles/skippy-profile-os/controls/one.rb b/test/fixtures/profiles/skippy-profile-os/controls/one.rb
similarity index 100%
rename from test/unit/mock/profiles/skippy-profile-os/controls/one.rb
rename to test/fixtures/profiles/skippy-profile-os/controls/one.rb
diff --git a/test/unit/mock/profiles/skippy-profile-os/inspec.yml b/test/fixtures/profiles/skippy-profile-os/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/skippy-profile-os/inspec.yml
rename to test/fixtures/profiles/skippy-profile-os/inspec.yml
diff --git a/test/unit/mock/profiles/slash-in-name/not-allowed/controls/filesystem_spec.rb b/test/fixtures/profiles/slash-in-name/not-allowed/controls/filesystem_spec.rb
similarity index 100%
rename from test/unit/mock/profiles/slash-in-name/not-allowed/controls/filesystem_spec.rb
rename to test/fixtures/profiles/slash-in-name/not-allowed/controls/filesystem_spec.rb
diff --git a/test/unit/mock/profiles/slash-in-name/not-allowed/inspec.yml b/test/fixtures/profiles/slash-in-name/not-allowed/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/slash-in-name/not-allowed/inspec.yml
rename to test/fixtures/profiles/slash-in-name/not-allowed/inspec.yml
diff --git a/test/unit/mock/profiles/spec_only/specfile.rb b/test/fixtures/profiles/spec_only/specfile.rb
similarity index 100%
rename from test/unit/mock/profiles/spec_only/specfile.rb
rename to test/fixtures/profiles/spec_only/specfile.rb
diff --git a/test/unit/mock/profiles/supermarket-dep/controls/default.rb b/test/fixtures/profiles/supermarket-dep/controls/default.rb
similarity index 100%
rename from test/unit/mock/profiles/supermarket-dep/controls/default.rb
rename to test/fixtures/profiles/supermarket-dep/controls/default.rb
diff --git a/test/unit/mock/profiles/supermarket-dep/inspec.yml b/test/fixtures/profiles/supermarket-dep/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/supermarket-dep/inspec.yml
rename to test/fixtures/profiles/supermarket-dep/inspec.yml
diff --git a/test/unit/mock/profiles/supported_inspec/inspec.yml b/test/fixtures/profiles/supported_inspec/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/supported_inspec/inspec.yml
rename to test/fixtures/profiles/supported_inspec/inspec.yml
diff --git a/test/unit/mock/profiles/unsupported_dependencies/child_profile/controls/profile1.rb b/test/fixtures/profiles/unsupported_dependencies/child_profile/controls/profile1.rb
similarity index 100%
rename from test/unit/mock/profiles/unsupported_dependencies/child_profile/controls/profile1.rb
rename to test/fixtures/profiles/unsupported_dependencies/child_profile/controls/profile1.rb
diff --git a/test/unit/mock/profiles/unsupported_dependencies/child_profile/inspec.yml b/test/fixtures/profiles/unsupported_dependencies/child_profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/unsupported_dependencies/child_profile/inspec.yml
rename to test/fixtures/profiles/unsupported_dependencies/child_profile/inspec.yml
diff --git a/test/unit/mock/profiles/unsupported_dependencies/child_profile2/controls/profile1.rb b/test/fixtures/profiles/unsupported_dependencies/child_profile2/controls/profile1.rb
similarity index 100%
rename from test/unit/mock/profiles/unsupported_dependencies/child_profile2/controls/profile1.rb
rename to test/fixtures/profiles/unsupported_dependencies/child_profile2/controls/profile1.rb
diff --git a/test/unit/mock/profiles/unsupported_dependencies/child_profile2/inspec.yml b/test/fixtures/profiles/unsupported_dependencies/child_profile2/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/unsupported_dependencies/child_profile2/inspec.yml
rename to test/fixtures/profiles/unsupported_dependencies/child_profile2/inspec.yml
diff --git a/test/unit/mock/profiles/unsupported_dependencies/wrapper-profile/controls/controls.rb b/test/fixtures/profiles/unsupported_dependencies/wrapper-profile/controls/controls.rb
similarity index 100%
rename from test/unit/mock/profiles/unsupported_dependencies/wrapper-profile/controls/controls.rb
rename to test/fixtures/profiles/unsupported_dependencies/wrapper-profile/controls/controls.rb
diff --git a/test/unit/mock/profiles/unsupported_dependencies/wrapper-profile/inspec.yml b/test/fixtures/profiles/unsupported_dependencies/wrapper-profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/unsupported_dependencies/wrapper-profile/inspec.yml
rename to test/fixtures/profiles/unsupported_dependencies/wrapper-profile/inspec.yml
diff --git a/test/unit/mock/profiles/unsupported_inspec/controls/unsupported.rb b/test/fixtures/profiles/unsupported_inspec/controls/unsupported.rb
similarity index 100%
rename from test/unit/mock/profiles/unsupported_inspec/controls/unsupported.rb
rename to test/fixtures/profiles/unsupported_inspec/controls/unsupported.rb
diff --git a/test/unit/mock/profiles/unsupported_inspec/inspec.yml b/test/fixtures/profiles/unsupported_inspec/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/unsupported_inspec/inspec.yml
rename to test/fixtures/profiles/unsupported_inspec/inspec.yml
diff --git a/test/unit/mock/profiles/waivers/basic/controls/basic.rb b/test/fixtures/profiles/waivers/basic/controls/basic.rb
similarity index 100%
rename from test/unit/mock/profiles/waivers/basic/controls/basic.rb
rename to test/fixtures/profiles/waivers/basic/controls/basic.rb
diff --git a/test/unit/mock/profiles/waivers/basic/files/waivers.yaml b/test/fixtures/profiles/waivers/basic/files/waivers.yaml
similarity index 100%
rename from test/unit/mock/profiles/waivers/basic/files/waivers.yaml
rename to test/fixtures/profiles/waivers/basic/files/waivers.yaml
diff --git a/test/unit/mock/profiles/waivers/basic/inspec.yml b/test/fixtures/profiles/waivers/basic/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/waivers/basic/inspec.yml
rename to test/fixtures/profiles/waivers/basic/inspec.yml
diff --git a/test/unit/mock/profiles/waivers/only_if/controls/only_if_controls.rb b/test/fixtures/profiles/waivers/only_if/controls/only_if_controls.rb
similarity index 100%
rename from test/unit/mock/profiles/waivers/only_if/controls/only_if_controls.rb
rename to test/fixtures/profiles/waivers/only_if/controls/only_if_controls.rb
diff --git a/test/unit/mock/profiles/waivers/only_if/files/empty.yaml b/test/fixtures/profiles/waivers/only_if/files/empty.yaml
similarity index 100%
rename from test/unit/mock/profiles/waivers/only_if/files/empty.yaml
rename to test/fixtures/profiles/waivers/only_if/files/empty.yaml
diff --git a/test/unit/mock/profiles/waivers/only_if/files/waiver.yaml b/test/fixtures/profiles/waivers/only_if/files/waiver.yaml
similarity index 100%
rename from test/unit/mock/profiles/waivers/only_if/files/waiver.yaml
rename to test/fixtures/profiles/waivers/only_if/files/waiver.yaml
diff --git a/test/unit/mock/profiles/waivers/only_if/inspec.yml b/test/fixtures/profiles/waivers/only_if/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/waivers/only_if/inspec.yml
rename to test/fixtures/profiles/waivers/only_if/inspec.yml
diff --git a/test/unit/mock/profiles/waivers/small/controls/small.rb b/test/fixtures/profiles/waivers/small/controls/small.rb
similarity index 100%
rename from test/unit/mock/profiles/waivers/small/controls/small.rb
rename to test/fixtures/profiles/waivers/small/controls/small.rb
diff --git a/test/unit/mock/profiles/waivers/small/files/bad-date.yaml b/test/fixtures/profiles/waivers/small/files/bad-date.yaml
similarity index 100%
rename from test/unit/mock/profiles/waivers/small/files/bad-date.yaml
rename to test/fixtures/profiles/waivers/small/files/bad-date.yaml
diff --git a/test/unit/mock/profiles/waivers/small/inspec.yml b/test/fixtures/profiles/waivers/small/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/waivers/small/inspec.yml
rename to test/fixtures/profiles/waivers/small/inspec.yml
diff --git a/test/unit/mock/profiles/waivers/waiver-child/controls/waiver-child.rb b/test/fixtures/profiles/waivers/waiver-child/controls/waiver-child.rb
similarity index 100%
rename from test/unit/mock/profiles/waivers/waiver-child/controls/waiver-child.rb
rename to test/fixtures/profiles/waivers/waiver-child/controls/waiver-child.rb
diff --git a/test/unit/mock/profiles/waivers/waiver-child/inspec.yml b/test/fixtures/profiles/waivers/waiver-child/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/waivers/waiver-child/inspec.yml
rename to test/fixtures/profiles/waivers/waiver-child/inspec.yml
diff --git a/test/unit/mock/profiles/waivers/waiver-wrapper/controls/waiver-wrapper.rb b/test/fixtures/profiles/waivers/waiver-wrapper/controls/waiver-wrapper.rb
similarity index 100%
rename from test/unit/mock/profiles/waivers/waiver-wrapper/controls/waiver-wrapper.rb
rename to test/fixtures/profiles/waivers/waiver-wrapper/controls/waiver-wrapper.rb
diff --git a/test/unit/mock/profiles/waivers/waiver-wrapper/files/waivers.yaml b/test/fixtures/profiles/waivers/waiver-wrapper/files/waivers.yaml
similarity index 100%
rename from test/unit/mock/profiles/waivers/waiver-wrapper/files/waivers.yaml
rename to test/fixtures/profiles/waivers/waiver-wrapper/files/waivers.yaml
diff --git a/test/unit/mock/profiles/waivers/waiver-wrapper/inspec.yml b/test/fixtures/profiles/waivers/waiver-wrapper/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/waivers/waiver-wrapper/inspec.yml
rename to test/fixtures/profiles/waivers/waiver-wrapper/inspec.yml
diff --git a/test/unit/mock/profiles/warn_logs/controls/control_with_logs.rb b/test/fixtures/profiles/warn_logs/controls/control_with_logs.rb
similarity index 100%
rename from test/unit/mock/profiles/warn_logs/controls/control_with_logs.rb
rename to test/fixtures/profiles/warn_logs/controls/control_with_logs.rb
diff --git a/test/unit/mock/profiles/warn_logs/inspec.yml b/test/fixtures/profiles/warn_logs/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/warn_logs/inspec.yml
rename to test/fixtures/profiles/warn_logs/inspec.yml
diff --git a/test/unit/mock/profiles/windows-only/controls/example.rb b/test/fixtures/profiles/windows-only/controls/example.rb
similarity index 100%
rename from test/unit/mock/profiles/windows-only/controls/example.rb
rename to test/fixtures/profiles/windows-only/controls/example.rb
diff --git a/test/unit/mock/profiles/windows-only/inspec.yml b/test/fixtures/profiles/windows-only/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/windows-only/inspec.yml
rename to test/fixtures/profiles/windows-only/inspec.yml
diff --git a/test/unit/mock/profiles/wrapper-override/README.md b/test/fixtures/profiles/wrapper-override/README.md
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/README.md
rename to test/fixtures/profiles/wrapper-override/README.md
diff --git a/test/unit/mock/profiles/wrapper-override/controls/default.rb b/test/fixtures/profiles/wrapper-override/controls/default.rb
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/controls/default.rb
rename to test/fixtures/profiles/wrapper-override/controls/default.rb
diff --git a/test/unit/mock/profiles/wrapper-override/inspec.lock b/test/fixtures/profiles/wrapper-override/inspec.lock
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/inspec.lock
rename to test/fixtures/profiles/wrapper-override/inspec.lock
diff --git a/test/unit/mock/profiles/wrapper-override/inspec.yml b/test/fixtures/profiles/wrapper-override/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/inspec.yml
rename to test/fixtures/profiles/wrapper-override/inspec.yml
diff --git a/test/unit/mock/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/README.md b/test/fixtures/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/README.md
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/README.md
rename to test/fixtures/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/README.md
diff --git a/test/unit/mock/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/controls/profile1.rb b/test/fixtures/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/controls/profile1.rb
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/controls/profile1.rb
rename to test/fixtures/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/controls/profile1.rb
diff --git a/test/unit/mock/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/inspec.yml b/test/fixtures/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/inspec.yml
rename to test/fixtures/profiles/wrapper-override/vendor/e39eb85366b272bae98e5eecdfac9f84c50a9ae9dd625fba2ce847268a6c3477/inspec.yml
diff --git a/test/unit/mock/profiles/wrong-char-profile/controls/control.rb b/test/fixtures/profiles/wrong-char-profile/controls/control.rb
similarity index 100%
rename from test/unit/mock/profiles/wrong-char-profile/controls/control.rb
rename to test/fixtures/profiles/wrong-char-profile/controls/control.rb
diff --git a/test/unit/mock/profiles/wrong-char-profile/files/ascii b/test/fixtures/profiles/wrong-char-profile/files/ascii
similarity index 100%
rename from test/unit/mock/profiles/wrong-char-profile/files/ascii
rename to test/fixtures/profiles/wrong-char-profile/files/ascii
diff --git a/test/unit/mock/profiles/wrong-char-profile/inspec.yml b/test/fixtures/profiles/wrong-char-profile/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/wrong-char-profile/inspec.yml
rename to test/fixtures/profiles/wrong-char-profile/inspec.yml
diff --git a/test/unit/mock/profiles/{{special-path}}/README.md b/test/fixtures/profiles/{{special-path}}/README.md
similarity index 100%
rename from test/unit/mock/profiles/{{special-path}}/README.md
rename to test/fixtures/profiles/{{special-path}}/README.md
diff --git a/test/unit/mock/profiles/{{special-path}}/controls/special-path.rb b/test/fixtures/profiles/{{special-path}}/controls/special-path.rb
similarity index 100%
rename from test/unit/mock/profiles/{{special-path}}/controls/special-path.rb
rename to test/fixtures/profiles/{{special-path}}/controls/special-path.rb
diff --git a/test/unit/mock/profiles/{{special-path}}/inspec.yml b/test/fixtures/profiles/{{special-path}}/inspec.yml
similarity index 100%
rename from test/unit/mock/profiles/{{special-path}}/inspec.yml
rename to test/fixtures/profiles/{{special-path}}/inspec.yml
diff --git a/test/unit/mock/reporters/cli_output b/test/fixtures/reporters/cli_output
similarity index 100%
rename from test/unit/mock/reporters/cli_output
rename to test/fixtures/reporters/cli_output
diff --git a/test/unit/mock/reporters/cli_output_windows b/test/fixtures/reporters/cli_output_windows
similarity index 100%
rename from test/unit/mock/reporters/cli_output_windows
rename to test/fixtures/reporters/cli_output_windows
diff --git a/test/unit/mock/reporters/json_merged_output b/test/fixtures/reporters/json_merged_output
similarity index 100%
rename from test/unit/mock/reporters/json_merged_output
rename to test/fixtures/reporters/json_merged_output
diff --git a/test/unit/mock/reporters/json_min_output b/test/fixtures/reporters/json_min_output
similarity index 100%
rename from test/unit/mock/reporters/json_min_output
rename to test/fixtures/reporters/json_min_output
diff --git a/test/unit/mock/reporters/json_output b/test/fixtures/reporters/json_output
similarity index 100%
rename from test/unit/mock/reporters/json_output
rename to test/fixtures/reporters/json_output
diff --git a/test/unit/mock/reporters/junit_output b/test/fixtures/reporters/junit_output
similarity index 100%
rename from test/unit/mock/reporters/junit_output
rename to test/fixtures/reporters/junit_output
diff --git a/test/unit/mock/reporters/run_data.json b/test/fixtures/reporters/run_data.json
similarity index 100%
rename from test/unit/mock/reporters/run_data.json
rename to test/fixtures/reporters/run_data.json
diff --git a/test/unit/mock/reporters/run_data.yml b/test/fixtures/reporters/run_data.yml
similarity index 100%
rename from test/unit/mock/reporters/run_data.yml
rename to test/fixtures/reporters/run_data.yml
diff --git a/test/unit/mock/reporters/run_data_wrapper.json b/test/fixtures/reporters/run_data_wrapper.json
similarity index 100%
rename from test/unit/mock/reporters/run_data_wrapper.json
rename to test/fixtures/reporters/run_data_wrapper.json
diff --git a/test/unit/mock/reporters/yaml_output b/test/fixtures/reporters/yaml_output
similarity index 100%
rename from test/unit/mock/reporters/yaml_output
rename to test/fixtures/reporters/yaml_output
diff --git a/test/functional/git_fetcher_test.rb b/test/functional/git_fetcher_test.rb
index 7cb5a197d..bc42f3698 100644
--- a/test/functional/git_fetcher_test.rb
+++ b/test/functional/git_fetcher_test.rb
@@ -122,7 +122,7 @@ describe "running profiles with git-based dependencies" do
       assert_includes run_result.stderr, "no/such/path" # the actual missing path
       assert_includes run_result.stderr, "profile in git repo"
       # The containing git repo (the only identifier the user will have)
-      assert_includes run_result.stderr, "test/unit/mock/profiles/git-fetcher/git-repo-01"
+      assert_includes run_result.stderr, "test/fixtures/profiles/git-fetcher/git-repo-01"
       assert_exit_code(1, run_result) # General user error
     end
   end
diff --git a/test/functional/helper.rb b/test/functional/helper.rb
index f0013052a..1e7fecd93 100644
--- a/test/functional/helper.rb
+++ b/test/functional/helper.rb
@@ -20,7 +20,7 @@ module FunctionalHelper
   let(:inspec_path) { File.join(repo_path, "inspec-bin", "bin", "inspec") }
   libdir = File.expand_path "lib"
   let(:exec_inspec) { [Gem.ruby, "-I#{libdir}", inspec_path].join " " }
-  let(:mock_path) { File.join(repo_path, "test", "unit", "mock") }
+  let(:mock_path) { File.join(repo_path, "test", "fixtures") }
   let(:profile_path) { File.join(mock_path, "profiles") }
   let(:examples_path) { File.join(profile_path, "old-examples") }
   let(:example_profile) { File.join(examples_path, "profile") }
diff --git a/test/functional/inspec_check_test.rb b/test/functional/inspec_check_test.rb
index 74143857d..6bf2764f8 100644
--- a/test/functional/inspec_check_test.rb
+++ b/test/functional/inspec_check_test.rb
@@ -60,7 +60,7 @@ describe "inspec check" do
       Dir.mktmpdir do |tmpdir|
         cache_dir = File.join(tmpdir, "inspec_check_test_cache")
         _(File.exist?(cache_dir)).must_equal false
-        good_profile_path = File.join(repo_path, "test/unit/mock/profiles/complete-profile")
+        good_profile_path = File.join(repo_path, "test/fixtures/profiles/complete-profile")
         out = inspec("check #{good_profile_path} --vendor-cache #{cache_dir}")
 
         _(File.exist?(cache_dir)).must_equal true
diff --git a/test/functional/inspec_exec_json_test.rb b/test/functional/inspec_exec_json_test.rb
index 8e446cf94..f1ba8b5c8 100644
--- a/test/functional/inspec_exec_json_test.rb
+++ b/test/functional/inspec_exec_json_test.rb
@@ -182,7 +182,7 @@ describe "inspec exec with json formatter" do
       actual = ex1.dup
 
       src = actual.delete("source_location")
-      _(src["ref"]).must_match %r{test/unit/mock/profiles/old-examples/profile/controls/example-tmp.rb$}
+      _(src["ref"]).must_match %r{test/fixtures/profiles/old-examples/profile/controls/example-tmp.rb$}
       _(src["line"]).must_equal 6
 
       result = actual.delete("results")[0]
diff --git a/test/functional/inspec_exec_test.rb b/test/functional/inspec_exec_test.rb
index be11bd6d0..e76d989a7 100644
--- a/test/functional/inspec_exec_test.rb
+++ b/test/functional/inspec_exec_test.rb
@@ -341,7 +341,7 @@ Test Summary: 0 successful, 0 failures, 0 skipped
     let(:out) { inspec("exec " + example_control + " --no-create-lockfile") }
 
     it "prints the control results, then the anonymous describe block results" do
-      _(stdout).must_match(/Profile: tests from .*test.unit.mock.profiles.old-examples.profile.controls.example-tmp.rb/)
+      _(stdout).must_match(/Profile: tests from .*test.fixtures.profiles.old-examples.profile.controls.example-tmp.rb/)
       _(stdout).must_include "
 Version: (not specified)
 Target:  local://
diff --git a/test/functional/logging_test.rb b/test/functional/logging_test.rb
index 3afd3088a..2e50a47f8 100644
--- a/test/functional/logging_test.rb
+++ b/test/functional/logging_test.rb
@@ -27,7 +27,7 @@ describe "Deprecation Facility Behavior" do
           _(json_result[1]["message"]).must_include "DEPRECATION"
           _(json_result[1]["message"]).must_include "This should fail"
           _(json_result[1]["message"]).must_include "(used at"
-          _(json_result[1]["message"]).must_include "test/unit/mock/profiles/deprecation/typical/controls/typical.rb"
+          _(json_result[1]["message"]).must_include "test/fixtures/profiles/deprecation/typical/controls/typical.rb"
           # TODO: Brittle Test
           _(json_result[1]["message"]).must_include "typical.rb:10" # Line number check
 
@@ -53,7 +53,7 @@ describe "Deprecation Facility Behavior" do
           _(deprecation_line).must_include "WARN"
           _(deprecation_line).must_include "This should fail"
           _(deprecation_line).must_include "(used at"
-          _(deprecation_line).must_include "test/unit/mock/profiles/deprecation/bare/controls/bare.rb"
+          _(deprecation_line).must_include "test/fixtures/profiles/deprecation/bare/controls/bare.rb"
           # TODO: Brittle Test
           _(deprecation_line).must_include "bare.rb:2"
 
@@ -77,7 +77,7 @@ describe "Deprecation Facility Behavior" do
         _(deprecation_line).must_include "ERROR"
         _(deprecation_line).must_include "This should exit"
         _(deprecation_line).must_include "(used at" # Beginning of a single-frame stack locator
-        _(deprecation_line).must_include "test/unit/mock/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
+        _(deprecation_line).must_include "test/fixtures/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
         # TODO: Brittle Test
         _(deprecation_line).must_include "typical.rb:27" # Line number check
 
@@ -104,7 +104,7 @@ describe "Deprecation Facility Behavior" do
         _(deprecation_line).must_include "ERROR" # Flagged as an error
         _(deprecation_line).must_include "This should exit" # Specific deprecation message
         _(deprecation_line).must_include "(used at" # Beginning of a single-frame stack locator
-        _(deprecation_line).must_include "test/unit/mock/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
+        _(deprecation_line).must_include "test/fixtures/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
         # TODO: Brittle Test
         _(deprecation_line).must_include "typical.rb:44" # Line number check
 
@@ -135,7 +135,7 @@ describe "Deprecation Facility Behavior" do
         _(deprecation_line).must_include "WARN" # Flagged as a warning
         _(deprecation_line).must_include "This should warn" # Specific deprecation message
         _(deprecation_line).must_include "(used at" # Beginning of a single-frame stack locator
-        _(deprecation_line).must_include "test/unit/mock/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
+        _(deprecation_line).must_include "test/fixtures/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
         # TODO: Brittle Test
         _(deprecation_line).must_include "typical.rb:61" # Line number check
 
@@ -154,13 +154,13 @@ describe "Deprecation Facility Behavior" do
         _(json_result[2]["status"]).must_equal "passed"
 
         # JSON mode will send debug messages to $stderr
-        # [2019-01-15T23:41:41-05:00] DEBUG: DEPRECATION: This should be ignored (used at test/unit/mock/profiles/deprecation/typical/controls/typical.rb:79)
+        # [2019-01-15T23:41:41-05:00] DEBUG: DEPRECATION: This should be ignored (used at test/fixtures/profiles/deprecation/typical/controls/typical.rb:79)
         deprecation_line = run_result.stderr.split("\n").detect { |line| line.include?("This should be ignored") }
         _(deprecation_line).wont_be_nil
         _(deprecation_line).must_include "DEBUG"
         _(deprecation_line).must_include "DEPRECATION"
         _(deprecation_line).must_include "(used at" # Beginning of a single-frame stack locator
-        _(deprecation_line).must_include "test/unit/mock/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
+        _(deprecation_line).must_include "test/fixtures/profiles/deprecation/typical/controls/typical.rb" # Frame should have been identified as coming from the test profile
         # TODO: Brittle Test
         _(deprecation_line).must_include "typical.rb:77" # Line number check
 
diff --git a/test/helpers/mock_loader.rb b/test/helpers/mock_loader.rb
index bdb79674a..9d1573b51 100644
--- a/test/helpers/mock_loader.rb
+++ b/test/helpers/mock_loader.rb
@@ -57,7 +57,7 @@ class MockLoader
     mock.mock_os(@platform)
 
     mockfile = lambda { |x|
-      path = ::File.join(scriptpath, "/unit/mock/files", x)
+      path = ::File.join(scriptpath, "/fixtures/files", x)
       local.file(path)
     }
 
@@ -166,12 +166,12 @@ class MockLoader
 
     # create all mock commands
     cmd = lambda { |x|
-      stdout = ::File.read(::File.join(scriptpath, "/unit/mock/cmd/" + x))
+      stdout = ::File.read(::File.join(scriptpath, "/fixtures/cmd/" + x))
       mock.mock_command("", stdout, "", 0)
     }
 
     cmd_stderr = lambda { |x = nil|
-      stderr = x.nil? ? "" : File.read(File.join(scriptpath, "unit/mock/cmd", x))
+      stderr = x.nil? ? "" : File.read(File.join(scriptpath, "fixtures/cmd", x))
       mock.mock_command("", "", stderr, 1)
     }
 
@@ -180,7 +180,7 @@ class MockLoader
     }
 
     cmd_exit_1 = lambda { |x = nil|
-      stderr = x.nil? ? "" : File.read(File.join(scriptpath, "unit/mock/cmd", x))
+      stderr = x.nil? ? "" : File.read(File.join(scriptpath, "fixtures/cmd", x))
       mock.mock_command("", "", stderr, 1)
     }
 
@@ -579,13 +579,14 @@ class MockLoader
       .mock_command(cmd, res[:stdout], res[:stderr], res[:exit_status])
   end
 
-  def self.home
-    File.expand_path "../../unit", __FILE__
+  def self.home # "home" of the repo (not test!)... I really dislike this name
+    File.expand_path "../../..", __FILE__
   end
 
   def self.profile_path(name)
     dst = name
-    dst = "#{home}/mock/profiles/#{name}" unless (Pathname.new name).absolute?
+    # TODO: raise if absolute path for name
+    dst = "#{home}/test/fixtures/profiles/#{name}" unless (Pathname.new name).absolute?
     dst
   end
 
@@ -597,7 +598,7 @@ class MockLoader
   end
 
   def self.profile_tgz(name)
-    path = File.join(home, "mock", "profiles", name)
+    path = File.join(home, "test", "fixtures", "profiles", name) # TODO: refactor these paths
     dst = File.join(Dir.mktmpdir, "#{name}.tar.gz")
 
     # generate relative paths
@@ -612,7 +613,7 @@ class MockLoader
   end
 
   def self.profile_zip(name, opts = {})
-    path = File.join(home, "mock", "profiles", name)
+    path = File.join(home, "test", "fixtures", "profiles", name)
     dst = File.join(Dir.mktmpdir, "#{name}.zip")
 
     # rubyzip only works relative paths
diff --git a/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life.rb b/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life.rb
deleted file mode 100644
index 2aeaa073a..000000000
--- a/test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# NOTE: we can't use require, because these test files are repeatedly reloaded
-load "test/unit/mock/plugins/meaning_of_life_path_mode/inspec-meaning-of-life/plugin.rb"
diff --git a/test/unit/plugin/v2/installer_test.rb b/test/unit/plugin/v2/installer_test.rb
index b35478484..43f07a34a 100644
--- a/test/unit/plugin/v2/installer_test.rb
+++ b/test/unit/plugin/v2/installer_test.rb
@@ -31,7 +31,7 @@ module InstallerTestHelpers
   def setup
     WebMock.disable_net_connect!(allow: %r{(api\.)?rubygems\.org/.*})
     repo_path = File.expand_path(File.join( __FILE__, "..", "..", "..", "..", ".."))
-    mock_path = File.join(repo_path, "test", "unit", "mock")
+    mock_path = File.join(repo_path, "test", "fixtures")
 
     @config_dir_path = File.join(mock_path, "config_dirs")
     @plugin_fixture_src_path = File.join(mock_path, "plugins", "inspec-test-fixture")
@@ -173,7 +173,10 @@ class PluginInstallerInstallationTests < Minitest::Test
     skip_slow_tests
 
     skip_windows!
-    @installer.install("inspec-test-fixture")
+    capture_subprocess_io do
+      @installer.install("inspec-test-fixture")
+    end
+
     # Because no exception was thrown, this is a positive test case for prefix-checking.
 
     # Installing a gem places it under the config dir gem area
@@ -204,7 +207,9 @@ class PluginInstallerInstallationTests < Minitest::Test
     skip_windows!
     skip_slow_tests
 
-    @installer.install("inspec-test-fixture", version: "= 0.1.0")
+    capture_subprocess_io do
+      @installer.install("inspec-test-fixture", version: "= 0.1.0")
+    end
 
     # Installing a gem places it under the config dir gem area
     spec_path = File.join(@installer.gem_path, "specifications", "inspec-test-fixture-0.1.0.gemspec")
@@ -313,7 +318,10 @@ class PluginInstallerUpdaterTests < Minitest::Test
     copy_in_config_dir("test-fixture-1-float")
     @installer.__reset_loader
     skip_windows!
-    @installer.update("inspec-test-fixture")
+
+    capture_subprocess_io do
+      @installer.update("inspec-test-fixture")
+    end
 
     # Verify presence of gemspecs
     spec_path = File.join(@installer.gem_path, "specifications", "inspec-test-fixture-0.2.0.gemspec")
@@ -336,7 +344,10 @@ class PluginInstallerUpdaterTests < Minitest::Test
 
     # Update to specific (but later) version
     skip_windows!
-    @installer.update("inspec-test-fixture", version: "0.2.0")
+
+    capture_subprocess_io do
+      @installer.update("inspec-test-fixture", version: "0.2.0")
+    end
 
     # Verify presence of gemspecs
     spec_path = File.join(@installer.gem_path, "specifications", "inspec-test-fixture-0.2.0.gemspec")
diff --git a/test/unit/plugin/v2/loader_test.rb b/test/unit/plugin/v2/loader_test.rb
index bda59c397..f746cbf62 100644
--- a/test/unit/plugin/v2/loader_test.rb
+++ b/test/unit/plugin/v2/loader_test.rb
@@ -22,7 +22,7 @@ class PluginLoaderTests < Minitest::Test
   def setup
     reset_globals
 
-    @config_dir_path = File.expand_path "test/unit/mock/config_dirs"
+    @config_dir_path = File.expand_path "test/fixtures/config_dirs"
     @bundled_plugins = [
       :'inspec-supermarket',
      ]
diff --git a/test/unit/plugin/v2/plugin_conf_test.rb b/test/unit/plugin/v2/plugin_conf_test.rb
index f6c05879e..e384e9471 100644
--- a/test/unit/plugin/v2/plugin_conf_test.rb
+++ b/test/unit/plugin/v2/plugin_conf_test.rb
@@ -1,5 +1,6 @@
 require "minitest/autorun"
 require "tmpdir"
+require "helpers/mock_loader"
 require_relative "../../../../lib/inspec/plugin/v2"
 
 # This file relies on setting environment variables for some
@@ -8,10 +9,10 @@ require_relative "../../../../lib/inspec/plugin/v2"
 describe "Inspec::Plugin::V2::ConfigFile" do
   orig_home = ENV["HOME"]
 
-  let(:repo_path) { File.expand_path(File.join( __FILE__, "..", "..", "..", "..", "..")) }
-  let(:config_fixtures_path) { File.join(repo_path, "test", "unit", "mock", "config_dirs") }
+  let(:repo_path) { MockLoader.home }
+  let(:config_fixtures_path) { "#{repo_path}/test/fixtures/config_dirs" }
   let(:config_file_obj) { Inspec::Plugin::V2::ConfigFile.new(constructor_arg) }
-  let(:constructor_arg) { File.join(config_fixtures_path, "plugin_config_files", fixture_name + ".json") }
+  let(:constructor_arg) { "#{config_fixtures_path}/plugin_config_files/#{fixture_name}.json" }
 
   after do
     ENV["HOME"] = orig_home
diff --git a/test/unit/profiles/profile_test.rb b/test/unit/profiles/profile_test.rb
index 3af3b346a..3dd06ef75 100644
--- a/test/unit/profiles/profile_test.rb
+++ b/test/unit/profiles/profile_test.rb
@@ -71,7 +71,7 @@ describe Inspec::Profile do
       _(info[:controls][0][:source_location]).must_equal loc
     end
 
-    it "gets code on tgz profiles" do
+    it "gets code on tgz profiles FUCK" do
       path = MockLoader.profile_tgz(profile_id)
       info = MockLoader.load_profile(path).info
       _(info[:controls][0][:code]).must_equal code
@@ -105,7 +105,7 @@ describe Inspec::Profile do
       let(:profile_id) { "empty-metadata" }
 
       it "prints loads of warnings" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :error, nil, ["Missing profile version in inspec.yml"]
         logger.expect :warn, nil, ["Missing profile summary in inspec.yml"]
         logger.expect :warn, nil, ["Missing profile maintainer in inspec.yml"]
@@ -119,7 +119,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal false
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_match(/tests from .*empty-metadata/)
         _(result[:summary][:controls]).must_equal 0
         _(result[:errors].length).must_equal 1
@@ -132,7 +132,7 @@ describe Inspec::Profile do
       let(:profile) { MockLoader.load_profile(profile_id, { logger: logger }) }
 
       it "prints ok messages" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :info, nil, ["Metadata OK."]
         logger.expect :warn, nil, ["No controls or tests were defined."]
 
@@ -143,7 +143,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal true
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "name"
         _(result[:summary][:controls]).must_equal 0
         _(result[:errors].length).must_equal 0
@@ -155,7 +155,7 @@ describe Inspec::Profile do
       let(:profile_id) { "complete-profile" }
 
       it "prints ok messages and counts the controls" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :info, nil, ["Metadata OK."]
         logger.expect :info, nil, ["Found 1 controls."]
         logger.expect :info, nil, ["Control definitions OK."]
@@ -166,7 +166,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal true
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "complete"
         _(result[:summary][:controls]).must_equal 1
         _(result[:errors].length).must_equal 0
@@ -180,7 +180,7 @@ describe Inspec::Profile do
       let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
       it "prints ok messages and counts the controls" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :info, nil, ["Metadata OK."]
         logger.expect :info, nil, ["Found 1 controls."]
         logger.expect :info, nil, ["Control definitions OK."]
@@ -191,7 +191,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal true
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "complete"
         _(result[:summary][:controls]).must_equal 1
         _(result[:errors].length).must_equal 0
@@ -205,7 +205,7 @@ describe Inspec::Profile do
       let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
       it "prints ok messages and counts the controls" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :info, nil, ["Metadata OK."]
         logger.expect :info, nil, ["Found 1 controls."]
         logger.expect :info, nil, ["Control definitions OK."]
@@ -216,7 +216,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal true
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "complete"
         _(result[:summary][:controls]).must_equal 1
         _(result[:errors].length).must_equal 0
@@ -230,7 +230,7 @@ describe Inspec::Profile do
       let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
       it "prints ok messages and counts the controls" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :info, nil, ["Metadata OK."]
         logger.expect :info, nil, ["Found 1 controls."]
         logger.expect :info, nil, ["Control definitions OK."]
@@ -241,7 +241,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal true
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "complete"
         _(result[:summary][:controls]).must_equal 1
         _(result[:errors].length).must_equal 0
@@ -255,7 +255,7 @@ describe Inspec::Profile do
       let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
       it "prints ok messages and counts the controls" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :warn, nil, ["No controls or tests were defined."]
         logger.expect :error, nil, ["Version needs to be in SemVer format"]
 
@@ -266,7 +266,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal false
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "invalid-version"
 
         _(result[:summary][:controls]).must_equal 0
@@ -279,7 +279,7 @@ describe Inspec::Profile do
       let(:profile_path) { "slash-in-name/not-allowed" } # Slashes allowed here
       let(:profile_name) { "slash-in-name/not-allowed" } # But not here
       it "issues an error" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_path}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_path}"]
         logger.expect :error, nil, ["The profile name (#{profile_name}) contains a slash which " \
           "is not permitted. Please remove all slashes from `inspec.yml`."]
         logger.expect :info, nil, ["Found 1 controls."]
@@ -298,7 +298,7 @@ describe Inspec::Profile do
       let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
       it "prints ok messages and counts the controls" do
-        logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+        logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
         logger.expect :warn, nil, ["License 'Invalid License Name' needs to be in SPDX format or marked as 'Proprietary'. See https://spdx.org/licenses/."]
         logger.expect :warn, nil, ["No controls or tests were defined."]
         logger.expect :info, nil, ["Metadata OK."]
@@ -310,7 +310,7 @@ describe Inspec::Profile do
 
         # verify hash result
         _(result[:summary][:valid]).must_equal true
-        _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+        _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
         _(result[:summary][:profile]).must_equal "license-invalid"
 
         _(result[:summary][:controls]).must_equal 0
@@ -324,7 +324,7 @@ describe Inspec::Profile do
         let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
         it "prints ok messages and counts the controls" do
-          logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+          logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
           logger.expect :warn, nil, ["No controls or tests were defined."]
           logger.expect :info, nil, ["Metadata OK."]
 
@@ -335,7 +335,7 @@ describe Inspec::Profile do
 
           # verify hash result
           _(result[:summary][:valid]).must_equal true
-          _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+          _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
           _(result[:summary][:profile]).must_equal "license-spdx"
 
           _(result[:summary][:controls]).must_equal 0
@@ -350,7 +350,7 @@ describe Inspec::Profile do
         let(:profile) { MockLoader.load_profile(profile_path, { logger: logger }) }
 
         it "prints ok messages and counts the controls" do
-          logger.expect :info, nil, ["Checking profile in #{home}/mock/profiles/#{profile_id}"]
+          logger.expect :info, nil, ["Checking profile in #{home}/test/fixtures/profiles/#{profile_id}"]
           logger.expect :warn, nil, ["No controls or tests were defined."]
           logger.expect :info, nil, ["Metadata OK."]
 
@@ -361,7 +361,7 @@ describe Inspec::Profile do
 
           # verify hash result
           _(result[:summary][:valid]).must_equal true
-          _(result[:summary][:location]).must_equal "#{home}/mock/profiles/#{profile_id}"
+          _(result[:summary][:location]).must_equal "#{home}/test/fixtures/profiles/#{profile_id}"
           _(result[:summary][:profile]).must_equal "license-proprietary"
 
           _(result[:summary][:controls]).must_equal 0
diff --git a/test/unit/reporters/automate_test.rb b/test/unit/reporters/automate_test.rb
index 94b429087..4e2d6b6ec 100644
--- a/test/unit/reporters/automate_test.rb
+++ b/test/unit/reporters/automate_test.rb
@@ -2,7 +2,6 @@ require "helper"
 require "inspec/reporters"
 
 describe Inspec::Reporters::Automate do
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:options) do
     {
       "url" => "https://my-automate-server.mycompany.com/data-collector/v0/",
@@ -15,7 +14,7 @@ describe Inspec::Reporters::Automate do
     }
   end
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures/reporters/run_data.json"), symbolize_names: true)
     options[:run_data] = data
     Inspec::Reporters::Automate.new(options)
   end
diff --git a/test/unit/reporters/base_test.rb b/test/unit/reporters/base_test.rb
index 2e86149cd..23a2fcf44 100644
--- a/test/unit/reporters/base_test.rb
+++ b/test/unit/reporters/base_test.rb
@@ -4,7 +4,7 @@ require "inspec/reporters"
 describe Inspec::Reporters::Base do
   let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures//reporters/run_data.json"), symbolize_names: true)
     Inspec::Reporters::Base.new({ run_data: data })
   end
 
diff --git a/test/unit/reporters/cli_test.rb b/test/unit/reporters/cli_test.rb
index 62c0d57a1..04c03c350 100644
--- a/test/unit/reporters/cli_test.rb
+++ b/test/unit/reporters/cli_test.rb
@@ -3,9 +3,9 @@ require "inspec/reporters"
 
 describe Inspec::Reporters::CLI do
   WINDOWS = RUBY_PLATFORM =~ /windows|mswin|msys|mingw|cygwin/
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
+
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures/reporters/run_data.json"), symbolize_names: true)
     cli = Inspec::Reporters::CLI
     cli.new({ run_data: data })
   end
@@ -29,9 +29,9 @@ describe Inspec::Reporters::CLI do
   describe "#render" do
     it "confirm render output" do
       if WINDOWS
-        cli_output = File.open(path + "/../mock/reporters/cli_output_windows", "r:UTF-8").read
+        cli_output = File.open("test/fixtures/reporters/cli_output_windows", "r:UTF-8").read
       else
-        cli_output = File.open(path + "/../mock/reporters/cli_output", "r:UTF-8").read
+        cli_output = File.open("test/fixtures/reporters/cli_output", "r:UTF-8").read
       end
 
       report.render
diff --git a/test/unit/reporters/json_automate_test.rb b/test/unit/reporters/json_automate_test.rb
index 30166b419..81a16fced 100644
--- a/test/unit/reporters/json_automate_test.rb
+++ b/test/unit/reporters/json_automate_test.rb
@@ -2,18 +2,15 @@ require "helper"
 require "inspec/reporters"
 
 describe Inspec::Reporters::JsonAutomate do
-  make_my_diffs_pretty!
-
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data_wrapper.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures/reporters/run_data_wrapper.json"), symbolize_names: true)
     Inspec::Reporters::JsonAutomate.new({ run_data: data })
   end
   let(:profiles) { report.send(:profiles) }
 
   describe "#render" do
     it "confirms render output" do
-      output = File.read(path + "/../mock/reporters/json_merged_output")
+      output = File.read("test/fixtures/reporters/json_merged_output")
       output = JSON.parse(output, symbolize_names: true)
       report.render
 
@@ -25,7 +22,7 @@ describe Inspec::Reporters::JsonAutomate do
 
   describe "#report_merged" do
     it "outputs the correct report_merged" do
-      output = File.read(path + "/../mock/reporters/json_merged_output")
+      output = File.read("test/fixtures/reporters/json_merged_output")
       output = JSON.parse(output, symbolize_names: true)
       _(report.report).must_equal output
     end
diff --git a/test/unit/reporters/json_min_test.rb b/test/unit/reporters/json_min_test.rb
index a6b08acf2..b5f1314ac 100644
--- a/test/unit/reporters/json_min_test.rb
+++ b/test/unit/reporters/json_min_test.rb
@@ -2,15 +2,14 @@ require "helper"
 require "inspec/reporters"
 
 describe Inspec::Reporters::JsonMin do
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures/reporters/run_data.json"), symbolize_names: true)
     Inspec::Reporters::JsonMin.new({ run_data: data })
   end
 
   describe "#render" do
     it "confirm render output" do
-      output = File.read(path + "/../mock/reporters/json_min_output")
+      output = File.read("test/fixtures/reporters/json_min_output")
       report.render
       _(report.rendered_output).must_equal output
     end
@@ -18,7 +17,7 @@ describe Inspec::Reporters::JsonMin do
 
   describe "#report" do
     it "confirm report output" do
-      output = File.read(path + "/../mock/reporters/json_min_output")
+      output = File.read("test/fixtures/reporters/json_min_output")
       output = JSON.parse(output, symbolize_names: true)
       _(report.report).must_equal output
     end
diff --git a/test/unit/reporters/json_test.rb b/test/unit/reporters/json_test.rb
index ace1079f4..c81bba920 100644
--- a/test/unit/reporters/json_test.rb
+++ b/test/unit/reporters/json_test.rb
@@ -2,9 +2,8 @@ require "helper"
 require "inspec/reporters"
 
 describe Inspec::Reporters::Json do
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures/reporters/run_data.json"), symbolize_names: true)
     Inspec::Reporters::Json.new({ run_data: data })
   end
   let(:profile) { report.run_data[:profiles].first }
@@ -12,7 +11,7 @@ describe Inspec::Reporters::Json do
 
   describe "#render" do
     it "confirm render output" do
-      output = File.read(path + "/../mock/reporters/json_output")
+      output = File.read("test/fixtures/reporters/json_output")
       report.render
       _(JSON.parse(report.rendered_output)).must_equal JSON.parse(output)
     end
@@ -20,7 +19,7 @@ describe Inspec::Reporters::Json do
 
   describe "#report" do
     it "confirm report output" do
-      output = File.read(path + "/../mock/reporters/json_output")
+      output = File.read("test/fixtures/reporters/json_output")
       output = JSON.parse(output, symbolize_names: true)
       _(report.report).must_equal output
     end
@@ -41,7 +40,7 @@ describe Inspec::Reporters::Json do
           "name" => "child",
         },
       }
-      data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+      data = JSON.parse(File.read("test/fixtures/reporters/run_data.json"), symbolize_names: true)
       data[:profiles].first[:depends] = depends
       json_report = Inspec::Reporters::Json.new({ run_data: data })
 
diff --git a/test/unit/reporters/junit_test.rb b/test/unit/reporters/junit_test.rb
index dca5b3f7c..2534c0e47 100644
--- a/test/unit/reporters/junit_test.rb
+++ b/test/unit/reporters/junit_test.rb
@@ -2,15 +2,15 @@ require "helper"
 require "inspec/reporters"
 
 describe Inspec::Reporters::Junit do
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:report) do
-    data = JSON.parse(File.read(path + "/../mock/reporters/run_data.json"), symbolize_names: true)
+    data = JSON.parse(File.read("test/fixtures/reporters/run_data.json"),
+                      symbolize_names: true)
     Inspec::Reporters::Junit.new({ run_data: data })
   end
 
   describe "#render" do
     it "confirm render output" do
-      cli_output = File.read(path + "/../mock/reporters/junit_output")
+      cli_output = File.read("test/fixtures/reporters/junit_output")
       report.render
       _(report.rendered_output).must_equal cli_output
     end
diff --git a/test/unit/reporters/yaml_test.rb b/test/unit/reporters/yaml_test.rb
index a23463dd6..1f82baa94 100644
--- a/test/unit/reporters/yaml_test.rb
+++ b/test/unit/reporters/yaml_test.rb
@@ -2,15 +2,14 @@ require "helper"
 require "inspec/reporters"
 
 describe Inspec::Reporters::Yaml do
-  let(:path) { File.expand_path(File.dirname(__FILE__)) }
   let(:report) do
-    data = YAML.load_file(path + "/../mock/reporters/run_data.yml")
+    data = YAML.load_file("test/fixtures/reporters/run_data.yml")
     Inspec::Reporters::Yaml.new({ run_data: data })
   end
 
   describe "#render" do
     it "confirm render output" do
-      output = File.read(path + "/../mock/reporters/yaml_output")
+      output = File.read("test/fixtures/reporters/yaml_output")
       report.render
       _(report.rendered_output).must_equal output
     end
diff --git a/test/unit/resources/aws_billing_report_test.rb b/test/unit/resources/aws_billing_report_test.rb
index ac6799c1c..197402432 100644
--- a/test/unit/resources/aws_billing_report_test.rb
+++ b/test/unit/resources/aws_billing_report_test.rb
@@ -2,7 +2,7 @@ require "helper"
 require "inspec/resource"
 require "resources/aws/aws_billing_report"
 
-require "unit/mock/files/aws_billing_backend"
+require "fixtures/files/aws_billing_backend"
 
 require "resource_support/aws"
 require "resources/aws/aws_billing_report"
diff --git a/test/unit/resources/aws_billing_reports_test.rb b/test/unit/resources/aws_billing_reports_test.rb
index 84cada225..9b9382130 100644
--- a/test/unit/resources/aws_billing_reports_test.rb
+++ b/test/unit/resources/aws_billing_reports_test.rb
@@ -2,7 +2,7 @@ require "helper"
 require "inspec/resource"
 require "resources/aws/aws_billing_reports"
 
-require "unit/mock/files/aws_billing_backend"
+require "fixtures/files/aws_billing_backend"
 
 require "resource_support/aws"
 require "resources/aws/aws_billing_reports"
diff --git a/test/unit/resources/file_test.rb b/test/unit/resources/file_test.rb
index 71f924e05..1a04378a9 100644
--- a/test/unit/resources/file_test.rb
+++ b/test/unit/resources/file_test.rb
@@ -94,7 +94,7 @@ describe Inspec::Resources::FileResource do
 
     # TODO: this is NOT a valid way to test. Please use _actual_ mock files
     # so we aren't beholden to the CI umask and other trivialities.
-    path = "test/unit/mock/files/emptyfile"
+    path = "test/fixtures/files/emptyfile"
     File.chmod 0644, path
     perms = "perms = %03o" % [File.stat(path).mode]
 
diff --git a/test/unit/resources/filesystem_test.rb b/test/unit/resources/filesystem_test.rb
index 12f84b308..6d224d54e 100644
--- a/test/unit/resources/filesystem_test.rb
+++ b/test/unit/resources/filesystem_test.rb
@@ -5,7 +5,7 @@ require "inspec/resources/filesystem"
 describe "Inspec::Resources::FileSystemResource" do
   it "verify filesystem on linux" do
     resource = quick_resource(:filesystem, :linux, "/") do |cmd|
-      stdout_file "test/unit/mock/cmd/df-PT"
+      stdout_file "test/fixtures/cmd/df-PT"
     end
 
     _(resource.size_kb).must_equal 30428648
diff --git a/test/unit/resources/oracledb_session_test.rb b/test/unit/resources/oracledb_session_test.rb
index 07f24b830..412c8171a 100644
--- a/test/unit/resources/oracledb_session_test.rb
+++ b/test/unit/resources/oracledb_session_test.rb
@@ -8,7 +8,7 @@ describe "Inspec::Resources::OracledbSession" do
       cmd.strip!
       case cmd
       when "/bin/sqlplus -S \"USER\"/\"password\"@localhost:1527/ORCL <<'EOC'\nSET MARKUP HTML ON\nSET PAGESIZE 32000\nSET FEEDBACK OFF\nSELECT NAME AS VALUE FROM v$database;\nEXIT\nEOC" then
-        stdout_file "test/unit/mock/cmd/oracle-result"
+        stdout_file "test/fixtures/cmd/oracle-result"
       else
         raise cmd.inspect
       end
@@ -25,7 +25,7 @@ describe "Inspec::Resources::OracledbSession" do
       cmd.strip!
       case cmd
       when "@'\nSET MARKUP HTML ON\nSET PAGESIZE 32000\nSET FEEDBACK OFF\nSELECT NAME AS VALUE FROM v$database;\nEXIT\n'@ | C:/sqlplus.exe -S \"USER\"/\"password\"@localhost:1527/ORCL" then
-        stdout_file "test/unit/mock/cmd/oracle-result"
+        stdout_file "test/fixtures/cmd/oracle-result"
       else
         raise cmd.inspect
       end
diff --git a/test/unit/resources/yum_test.rb b/test/unit/resources/yum_test.rb
index 6227522d4..3c56de39b 100644
--- a/test/unit/resources/yum_test.rb
+++ b/test/unit/resources/yum_test.rb
@@ -5,13 +5,13 @@ require "inspec/resources/yum"
 describe "Inspec::Resources::YumRepo" do
   let(:centos7) do
     quick_resource("yum", :centos7) do |cmd|
-      stdout_file "./test/unit/mock/cmd/yum-centos7-repolist-all"
+      stdout_file "./test/fixtures/cmd/yum-centos7-repolist-all"
     end
   end
 
   let(:centos8) do
     quick_resource("yum", :centos8) do |cmd|
-      stdout_file "./test/unit/mock/cmd/yum-centos8-repolist-all"
+      stdout_file "./test/fixtures/cmd/yum-centos8-repolist-all"
     end
   end