diff --git a/site_yamls/site-definition.yaml b/site_yamls/site/site-definition.yaml
similarity index 100%
rename from site_yamls/site-definition.yaml
rename to site_yamls/site/site-definition.yaml
diff --git a/src/bin/pegleg/tests/unit/test_engine_util_files.py b/src/bin/pegleg/tests/unit/test_engine_util_files.py
new file mode 100644
index 00000000..4f1451a8
--- /dev/null
+++ b/src/bin/pegleg/tests/unit/test_engine_util_files.py
@@ -0,0 +1,30 @@
+# Copyright 2018 AT&T Intellectual Property.  All other rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import tempfile
+
+from pegleg import config
+from pegleg.engine.util import files
+
+def test_no_non_yamls(tmpdir):
+    p = tmpdir.mkdir("site_yamls").mkdir("global")
+    for x in range(3):  # Create 3 YAML files
+        p.join("good-%d.yaml" % x).write('fake-content')
+    p.join("bad.txt").write("fake-content")
+    config.set_primary_repo(str(tmpdir.listdir()[0]))
+    results = list(files.all())
+
+    assert 3 == len(results)
+    # make sure only YAML files are returned
+    for i in results:
+        assert i.endswith('.yaml')
diff --git a/src/bin/pegleg/tests/unit/test_selectable_linitng.py b/src/bin/pegleg/tests/unit/test_selectable_linting.py
similarity index 100%
rename from src/bin/pegleg/tests/unit/test_selectable_linitng.py
rename to src/bin/pegleg/tests/unit/test_selectable_linting.py