diff --git a/test/integration/dns/kameronkenny.com/blog/local-setup.bash b/test/integration/dns/kameronkenny.com/blog/local-setup.bash
index cc35f5b..7558397 100644
--- a/test/integration/dns/kameronkenny.com/blog/local-setup.bash
+++ b/test/integration/dns/kameronkenny.com/blog/local-setup.bash
@@ -2,9 +2,10 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
   source "$DIR/helper.bash"
 }
 
diff --git a/test/integration/dns/kameronkenny.com/a.bat b/test/integration/dns/kameronkenny.com/blog/tests.bat
similarity index 77%
rename from test/integration/dns/kameronkenny.com/a.bat
rename to test/integration/dns/kameronkenny.com/blog/tests.bat
index 24c333d..0803cc6 100644
--- a/test/integration/dns/kameronkenny.com/a.bat
+++ b/test/integration/dns/kameronkenny.com/blog/tests.bat
@@ -5,8 +5,8 @@ _local_setup
 
 load 'helper'
 
-
 @test "Test A Record: ${domain}" {
-  run dig -t A ${domain} +noall +answer 
+  run _check_a_record
   assert_output --partial "${ip}"
 }
+
diff --git a/test/integration/dns/kameronkenny.com/local-setup.bash b/test/integration/dns/kameronkenny.com/local-setup.bash
index c47a365..ce0a943 100644
--- a/test/integration/dns/kameronkenny.com/local-setup.bash
+++ b/test/integration/dns/kameronkenny.com/local-setup.bash
@@ -2,9 +2,10 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
   source "$DIR/helper.bash"
 }
 
diff --git a/test/integration/dns/kameronkenny.com/ns1/local-setup.bash b/test/integration/dns/kameronkenny.com/ns1/local-setup.bash
index cc35f5b..7558397 100644
--- a/test/integration/dns/kameronkenny.com/ns1/local-setup.bash
+++ b/test/integration/dns/kameronkenny.com/ns1/local-setup.bash
@@ -2,9 +2,10 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
   source "$DIR/helper.bash"
 }
 
diff --git a/test/integration/dns/kameronkenny.com/blog/a.bat b/test/integration/dns/kameronkenny.com/ns1/tests.bat
similarity index 77%
rename from test/integration/dns/kameronkenny.com/blog/a.bat
rename to test/integration/dns/kameronkenny.com/ns1/tests.bat
index 24c333d..0803cc6 100644
--- a/test/integration/dns/kameronkenny.com/blog/a.bat
+++ b/test/integration/dns/kameronkenny.com/ns1/tests.bat
@@ -5,8 +5,8 @@ _local_setup
 
 load 'helper'
 
-
 @test "Test A Record: ${domain}" {
-  run dig -t A ${domain} +noall +answer 
+  run _check_a_record
   assert_output --partial "${ip}"
 }
+
diff --git a/test/integration/dns/kameronkenny.com/ns2/local-setup.bash b/test/integration/dns/kameronkenny.com/ns2/local-setup.bash
index cc35f5b..7558397 100644
--- a/test/integration/dns/kameronkenny.com/ns2/local-setup.bash
+++ b/test/integration/dns/kameronkenny.com/ns2/local-setup.bash
@@ -2,9 +2,10 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
   source "$DIR/helper.bash"
 }
 
diff --git a/test/integration/dns/kameronkenny.com/ns1/a.bat b/test/integration/dns/kameronkenny.com/ns2/tests.bat
similarity index 77%
rename from test/integration/dns/kameronkenny.com/ns1/a.bat
rename to test/integration/dns/kameronkenny.com/ns2/tests.bat
index 24c333d..0803cc6 100644
--- a/test/integration/dns/kameronkenny.com/ns1/a.bat
+++ b/test/integration/dns/kameronkenny.com/ns2/tests.bat
@@ -5,8 +5,8 @@ _local_setup
 
 load 'helper'
 
-
 @test "Test A Record: ${domain}" {
-  run dig -t A ${domain} +noall +answer 
+  run _check_a_record
   assert_output --partial "${ip}"
 }
+
diff --git a/test/integration/dns/kameronkenny.com/photos/local-setup.bash b/test/integration/dns/kameronkenny.com/photos/local-setup.bash
index cc35f5b..7558397 100644
--- a/test/integration/dns/kameronkenny.com/photos/local-setup.bash
+++ b/test/integration/dns/kameronkenny.com/photos/local-setup.bash
@@ -2,9 +2,10 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
   source "$DIR/helper.bash"
 }
 
diff --git a/test/integration/dns/kameronkenny.com/photos/tests.bat b/test/integration/dns/kameronkenny.com/photos/tests.bat
new file mode 100644
index 0000000..8abcfab
--- /dev/null
+++ b/test/integration/dns/kameronkenny.com/photos/tests.bat
@@ -0,0 +1,12 @@
+#!/usr/bin/env bats
+
+load 'local-setup'
+_local_setup
+
+load 'helper'
+
+@test "Test CNAME Record: ${domain}" {
+  run _check_cname_record
+  assert_output --partial "${cname}"
+}
+
diff --git a/test/integration/dns/kameronkenny.com/soa.bat b/test/integration/dns/kameronkenny.com/soa.bat
deleted file mode 100644
index d182dfe..0000000
--- a/test/integration/dns/kameronkenny.com/soa.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bats
-
-load 'local-setup'
-_local_setup
-
-load 'helper'
-
-
-@test "Test SOA Record: ${domain}" {
-  run dig -t SOA ${domain} +noall +answer +multi
-  assert_output --partial "${serial}"
-}
diff --git a/test/integration/dns/kameronkenny.com/tests.bat b/test/integration/dns/kameronkenny.com/tests.bat
new file mode 100644
index 0000000..53b4976
--- /dev/null
+++ b/test/integration/dns/kameronkenny.com/tests.bat
@@ -0,0 +1,26 @@
+#!/usr/bin/env bats
+
+load 'local-setup'
+_local_setup
+
+load 'helper'
+
+@test "Test A Record: ${domain}" {
+  run _check_a_record
+  assert_output --partial "${ip}"
+}
+
+@test "Test SOA Record: ${domain}" {
+  run _check_soa_record
+  assert_output --partial "${serial}"
+}
+
+@test "Test SOA Record @ns1: ${domain}" {
+  run _check_soa_record_at_ns1
+  assert_output --partial "${serial}"
+}
+
+@test "Test SOA Record @ns2: ${domain}" {
+  run _check_soa_record_at_ns2
+  assert_output --partial "${serial}"
+}
diff --git a/test/integration/dns/kameronkenny.com/www/a.bat b/test/integration/dns/kameronkenny.com/www/a.bat
deleted file mode 100644
index 24c333d..0000000
--- a/test/integration/dns/kameronkenny.com/www/a.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bats
-
-load 'local-setup'
-_local_setup
-
-load 'helper'
-
-
-@test "Test A Record: ${domain}" {
-  run dig -t A ${domain} +noall +answer 
-  assert_output --partial "${ip}"
-}
diff --git a/test/integration/dns/kameronkenny.com/www/local-setup.bash b/test/integration/dns/kameronkenny.com/www/local-setup.bash
index cc35f5b..7558397 100644
--- a/test/integration/dns/kameronkenny.com/www/local-setup.bash
+++ b/test/integration/dns/kameronkenny.com/www/local-setup.bash
@@ -2,9 +2,10 @@
 
 _local_setup() {
   DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
-  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../../" )" >/dev/null 2>&1 && pwd)"
   bats_load_library bats-support
   bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
   source "$DIR/helper.bash"
 }
 
diff --git a/test/integration/dns/kameronkenny.com/ns2/a.bat b/test/integration/dns/kameronkenny.com/www/tests.bat
similarity index 77%
rename from test/integration/dns/kameronkenny.com/ns2/a.bat
rename to test/integration/dns/kameronkenny.com/www/tests.bat
index 24c333d..0803cc6 100644
--- a/test/integration/dns/kameronkenny.com/ns2/a.bat
+++ b/test/integration/dns/kameronkenny.com/www/tests.bat
@@ -5,8 +5,8 @@ _local_setup
 
 load 'helper'
 
-
 @test "Test A Record: ${domain}" {
-  run dig -t A ${domain} +noall +answer 
+  run _check_a_record
   assert_output --partial "${ip}"
 }
+
diff --git a/test/integration/dns/thelinux.pro/helper.bash b/test/integration/dns/thelinux.pro/helper.bash
new file mode 100644
index 0000000..5f85714
--- /dev/null
+++ b/test/integration/dns/thelinux.pro/helper.bash
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+export domain="kameronkenny.com"
+export ip="204.8.15.81"
+export serial="24070101"
diff --git a/test/integration/dns/thelinux.pro/local-setup.bash b/test/integration/dns/thelinux.pro/local-setup.bash
new file mode 100644
index 0000000..ce0a943
--- /dev/null
+++ b/test/integration/dns/thelinux.pro/local-setup.bash
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+_local_setup() {
+  DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd)"
+  TEST_ROOT="$( cd "$( dirname "$DIR/../../../" )" >/dev/null 2>&1 && pwd)"
+  bats_load_library bats-support
+  bats_load_library bats-assert
+  load "$TEST_ROOT/test_helper/dns-functions"
+  source "$DIR/helper.bash"
+}
+
diff --git a/test/integration/dns/thelinux.pro/tests.bat b/test/integration/dns/thelinux.pro/tests.bat
new file mode 100644
index 0000000..53b4976
--- /dev/null
+++ b/test/integration/dns/thelinux.pro/tests.bat
@@ -0,0 +1,26 @@
+#!/usr/bin/env bats
+
+load 'local-setup'
+_local_setup
+
+load 'helper'
+
+@test "Test A Record: ${domain}" {
+  run _check_a_record
+  assert_output --partial "${ip}"
+}
+
+@test "Test SOA Record: ${domain}" {
+  run _check_soa_record
+  assert_output --partial "${serial}"
+}
+
+@test "Test SOA Record @ns1: ${domain}" {
+  run _check_soa_record_at_ns1
+  assert_output --partial "${serial}"
+}
+
+@test "Test SOA Record @ns2: ${domain}" {
+  run _check_soa_record_at_ns2
+  assert_output --partial "${serial}"
+}
diff --git a/test/integration/test_helper/dns-functions.bash b/test/integration/test_helper/dns-functions.bash
new file mode 100644
index 0000000..f264341
--- /dev/null
+++ b/test/integration/test_helper/dns-functions.bash
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+_check_soa_record() {
+  dig -t SOA ${domain} +noall +answer +multi
+}
+
+_check_soa_record_at_ns1() {
+  dig -t SOA ${domain} +noall +answer +multi @204.8.15.80
+}
+
+_check_soa_record_at_ns2() {
+  dig -t SOA ${domain} +noall +answer +multi @204.8.15.81
+}
+
+_check_a_record() {
+  dig -t A ${domain} +noall +answer
+}
+
+_check_cname_record() {
+  dig -t CNAME ${domain} +noall +answer
+}