diff --git a/.gitignore b/.gitignore
index 4b45182d4..94f77a853 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,6 +91,9 @@ celerybeat-schedule
 venv/
 ENV/
 
+# visual studio
+.vs/
+
 # Spyder project settings
 .spyderproject
 .spyproject
@@ -121,6 +124,10 @@ Dockerfile.*_*
 ignore/
 tmp/
 
-#Vagrant Specific files
+# `salt-formula` -- Vagrant Specific files
 .vagrant
 top.sls
+
+# `suricata-formula` -- Platform binaries
+*.rpm
+*.deb
diff --git a/CODEOWNERS b/CODEOWNERS
index 76f22be60..a70185efa 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -19,7 +19,7 @@
 /*/_mapdata/                                @saltstack-formulas/ssf
 /*/libsaltcli.jinja                         @saltstack-formulas/ssf
 /*/libtofs.jinja                            @saltstack-formulas/ssf
-/test/integration/**/_mapdata_spec.rb       @saltstack-formulas/ssf
+/test/integration/**/_mapdata.rb            @saltstack-formulas/ssf
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf
 /test/integration/**/README.md              @saltstack-formulas/ssf
diff --git a/test/integration/v3000-py2/controls/_mapdata_spec.rb b/test/integration/v3000-py2/controls/_mapdata.rb
similarity index 96%
rename from test/integration/v3000-py2/controls/_mapdata_spec.rb
rename to test/integration/v3000-py2/controls/_mapdata.rb
index 646353235..b0232ad01 100644
--- a/test/integration/v3000-py2/controls/_mapdata_spec.rb
+++ b/test/integration/v3000-py2/controls/_mapdata.rb
@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-control '`map.jinja` YAML dump' do
-  title 'should match the comparison file'
+control 'salt._mapdata' do
+  title '`map.jinja` should match the reference file'
 
   ### Method
   # The steps below for each file appear convoluted but they are both required
diff --git a/test/integration/v3000-py3/controls/_mapdata_spec.rb b/test/integration/v3000-py3/controls/_mapdata.rb
similarity index 96%
rename from test/integration/v3000-py3/controls/_mapdata_spec.rb
rename to test/integration/v3000-py3/controls/_mapdata.rb
index 646353235..b0232ad01 100644
--- a/test/integration/v3000-py3/controls/_mapdata_spec.rb
+++ b/test/integration/v3000-py3/controls/_mapdata.rb
@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-control '`map.jinja` YAML dump' do
-  title 'should match the comparison file'
+control 'salt._mapdata' do
+  title '`map.jinja` should match the reference file'
 
   ### Method
   # The steps below for each file appear convoluted but they are both required
diff --git a/test/integration/v3001-py3/controls/_mapdata_spec.rb b/test/integration/v3001-py3/controls/_mapdata.rb
similarity index 96%
rename from test/integration/v3001-py3/controls/_mapdata_spec.rb
rename to test/integration/v3001-py3/controls/_mapdata.rb
index 646353235..b0232ad01 100644
--- a/test/integration/v3001-py3/controls/_mapdata_spec.rb
+++ b/test/integration/v3001-py3/controls/_mapdata.rb
@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-control '`map.jinja` YAML dump' do
-  title 'should match the comparison file'
+control 'salt._mapdata' do
+  title '`map.jinja` should match the reference file'
 
   ### Method
   # The steps below for each file appear convoluted but they are both required
diff --git a/test/integration/v3002-py3/controls/_mapdata_spec.rb b/test/integration/v3002-py3/controls/_mapdata.rb
similarity index 96%
rename from test/integration/v3002-py3/controls/_mapdata_spec.rb
rename to test/integration/v3002-py3/controls/_mapdata.rb
index 646353235..b0232ad01 100644
--- a/test/integration/v3002-py3/controls/_mapdata_spec.rb
+++ b/test/integration/v3002-py3/controls/_mapdata.rb
@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-control '`map.jinja` YAML dump' do
-  title 'should match the comparison file'
+control 'salt._mapdata' do
+  title '`map.jinja` should match the reference file'
 
   ### Method
   # The steps below for each file appear convoluted but they are both required