diff --git a/.circleci/config.yml b/.circleci/config.yml
index a616137..b182848 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,6 +60,60 @@
                 cat /tmp/goss.tmp | grep "[<\>]" > ~/project/test-results/goss.xml
           - store_test_results:
               path: test-results
+      test:
+        docker:
+          - image: circleci/buildpack-deps:stretch
+          steps:
+            - setup_remote_docker:
+                docker_layer_caching: true
+            - checkout
+            - run:
+                name: Docker Login
+                command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+            - run:
+                name: Docker pull
+                command: docker pull $IMAGE_NAME:$CIRCLE_SHA1
+            - run:
+                name: Setup test volume
+                command: |
+                  mkdir test-results
+                  docker volume create sc4s-tests
+                  docker volume create sc4s-results
+
+                  docker container create --name dummy \
+                          -v sc4s-tests:/work/tests \
+                          -v sc4s-results:/work/test-results \
+                          registry.access.redhat.com/ubi7/ubi
+                  docker cp tests/ dummy:/work/tests/
+                  docker rm dummy
+            - run:
+                name: Docker Compose build
+                command: |
+                  docker-compose build \
+                    --build-arg  RH_ACTIVATION=$RH_ACTIVATION \
+                    --build-arg  RH_ORG=$RH_ORG
+            - run:
+                name: Docker Compose up
+                command: docker-compose up  --abort-on-container-exit
+            - run:
+                name: Collect test results from Docker Compose
+                command: |
+                  docker container create --name dummy \
+                          -v sc4s-tests:/work/tests \
+                          -v sc4s-results:/work/test-results \
+                          registry.access.redhat.com/ubi7/ubi
+
+                  docker cp dummy:/work/test-results/functional test-results
+                  docker rm dummy
+            - run:
+                name: Cleanup volumes
+                command: |
+                  docker volume rm sc4s-tests
+                  docker volume rm sc4s-results
+            - store_test_results:
+                path: test-results
+
+
       publish:
         environment:
           IMAGE_NAME: rfaircloth/scs
@@ -91,9 +145,13 @@
           - dgoss:
               requires:
                 - build
+          - test:
+              - requires:
+                - build
           - publish:
               requires:
                 - dgoss
+                - test
               filters:
                 branches:
                   only:
diff --git a/.gitignore b/.gitignore
index 527731f..d3efeb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -305,3 +305,6 @@ tags
 # Persistent undo
 [._]*.un~
 
+/.env
+/test-results
+/.idea
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 3f7f406..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Remote Python 3.7.3 Docker Compose (test at [/Users/rfaircloth/PycharmProjects/sc4s/docker-compose.yml])" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index aa62d56..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/sc4s.iml" filepath="$PROJECT_DIR$/.idea/sc4s.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/sc4s.iml b/.idea/sc4s.iml
deleted file mode 100644
index 251be75..0000000
--- a/.idea/sc4s.iml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Remote Python 3.7.3 Docker Compose (test at [/Users/rfaircloth/PycharmProjects/sc4s/docker-compose.yml])" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 53b20c8..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/package/syslog-ng" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/package/syslog-ng/lib/ivykis" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/package/syslog-ng/lib/jsonc" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 44b7535..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,612 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="5d2eb73b-b080-4040-becf-dac45602ac01" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.circleci/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.circleci/config.yml" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/package/Dockerfile">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1587">
-              <caret line="92" column="85" selection-start-line="92" selection-start-column="81" selection-end-line="92" selection-end-column="85" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.circleci/config.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="229">
-              <caret line="95" column="23" selection-start-line="95" selection-start-column="23" selection-end-line="95" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Python Script" />
-      </list>
-    </option>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>pip</find>
-      <find>yum</find>
-      <find>java</find>
-      <find>goss.y</find>
-      <find>goss</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/requirements.txt" />
-        <option value="$PROJECT_DIR$/.pytest_cache/Dockerfile" />
-        <option value="$PROJECT_DIR$/Dockerfile" />
-        <option value="$PROJECT_DIR$/package/confluent.repo" />
-        <option value="$PROJECT_DIR$/package/etc/conf.d/sources/s_defaults.conf" />
-        <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/package/sbin/entrypoint.sh" />
-        <option value="$PROJECT_DIR$/package/etc/syslog-ng.conf" />
-        <option value="$PROJECT_DIR$/package/goss.yml" />
-        <option value="$PROJECT_DIR$/tests/Dockerfile" />
-        <option value="$PROJECT_DIR$/package/etc/conf.d/splunk.conf" />
-        <option value="$PROJECT_DIR$/docker-compose.yml" />
-        <option value="$PROJECT_DIR$/tests/requirements.txt" />
-        <option value="$PROJECT_DIR$/tests/test_poc.py" />
-        <option value="$PROJECT_DIR$/LICENSE" />
-        <option value="$PROJECT_DIR$/.circleci/config.xml" />
-        <option value="$PROJECT_DIR$/package/Dockerfile" />
-        <option value="$PROJECT_DIR$/.circleci/config.yml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="165" />
-    <option name="width" value="1760" />
-    <option name="height" value="825" />
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="sc4s" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sc4s" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sc4s" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sc4s" type="462c0819:PsiDirectoryNode" />
-              <item name=".circleci" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sc4s" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sc4s" type="462c0819:PsiDirectoryNode" />
-              <item name="package" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sc4s" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sc4s" type="462c0819:PsiDirectoryNode" />
-              <item name="package" type="462c0819:PsiDirectoryNode" />
-              <item name="etc" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sc4s" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sc4s" type="462c0819:PsiDirectoryNode" />
-              <item name="package" type="462c0819:PsiDirectoryNode" />
-              <item name="scripts" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="sc4s" type="b2602c69:ProjectViewProjectNode" />
-              <item name="sc4s" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
-  </component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/package/etc/conf.d/templates" />
-      <recent name="$PROJECT_DIR$/package/etc/conf.d/sources" />
-      <recent name="$PROJECT_DIR$/package/etc/conf.d/blocks" />
-      <recent name="$PROJECT_DIR$/package/etc/conf.d/filters" />
-      <recent name="$PROJECT_DIR$/tests" />
-    </key>
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected="Python tests.pytest in tests docker">
-    <configuration default="true" type="tests" factoryName="py.test">
-      <module name="sc4s" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="$PROJECT_DIR$/venv/bin/python" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;tests&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration name="pytest in tests docker" type="tests" factoryName="py.test">
-      <module name="sc4s" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/docker-compose.yml]:test/python" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;tests&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <configuration name="pytest in tests" type="tests" factoryName="py.test" nameIsGenerated="true">
-      <module name="sc4s" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <option name="SDK_HOME" value="$PROJECT_DIR$/venv/bin/python" />
-      <option name="WORKING_DIRECTORY" value="" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="_new_keywords" value="&quot;&quot;" />
-      <option name="_new_additionalArguments" value="&quot;&quot;" />
-      <option name="_new_target" value="&quot;tests&quot;" />
-      <option name="_new_targetType" value="&quot;PATH&quot;" />
-      <method v="2" />
-    </configuration>
-    <list>
-      <item itemvalue="Python tests.pytest in tests" />
-      <item itemvalue="Python tests.pytest in tests docker" />
-    </list>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="5d2eb73b-b080-4040-becf-dac45602ac01" name="Default Changelist" comment="" />
-      <created>1561601135562</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1561601135562</updated>
-      <workItem from="1561601137668" duration="2116000" />
-      <workItem from="1561639548755" duration="1822000" />
-      <workItem from="1561641521581" duration="41606000" />
-      <workItem from="1561723177513" duration="18142000" />
-    </task>
-    <task id="LOCAL-00001" summary="Clean build of syslog-docker">
-      <created>1561725354114</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1561725354114</updated>
-    </task>
-    <task id="LOCAL-00002" summary="Build with healthcheck">
-      <created>1561727911945</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1561727911945</updated>
-    </task>
-    <task id="LOCAL-00003" summary="compose with proper service names">
-      <created>1561728088283</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1561728088283</updated>
-    </task>
-    <task id="LOCAL-00004" summary="Correct healthcheck">
-      <created>1561732858768</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1561732858768</updated>
-    </task>
-    <task id="LOCAL-00005" summary="Working default route test case">
-      <created>1561742879170</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1561742879170</updated>
-    </task>
-    <task id="LOCAL-00006" summary="Working default route test case">
-      <created>1561749672876</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1561749672877</updated>
-    </task>
-    <task id="LOCAL-00007" summary="add circleci">
-      <created>1561756254127</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1561756254127</updated>
-    </task>
-    <task id="LOCAL-00008" summary="add context flag">
-      <created>1561756480339</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1561756480339</updated>
-    </task>
-    <task id="LOCAL-00009" summary="build in sub directory">
-      <created>1561756707590</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1561756707590</updated>
-    </task>
-    <task id="LOCAL-00010" summary="build in sub directory">
-      <created>1561756813319</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1561756813319</updated>
-    </task>
-    <task id="LOCAL-00011" summary="add submodule config">
-      <created>1561757391279</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1561757391279</updated>
-    </task>
-    <task id="LOCAL-00012" summary="add submodule config">
-      <created>1561757671153</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1561757671153</updated>
-    </task>
-    <task id="LOCAL-00013" summary="submodules need recursive">
-      <created>1561761791106</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1561761791106</updated>
-    </task>
-    <option name="localTasksCounter" value="14" />
-    <servers />
-  </component>
-  <component name="TestHistory">
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 40m 27s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 43m 28s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 45m 34s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 47m 23s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 48m 31s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 54m 57s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 55m 29s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 15h 57m 06s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 16h 08m 53s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-    <history-entry file="pytest_in_tests_docker - 2019.06.28 at 16h 09m 43s.xml">
-      <configuration name="pytest in tests docker" configurationId="tests" />
-    </history-entry>
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="76788000" />
-  </component>
-  <component name="TodoView">
-    <todo-panel id="selected-file">
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="814" extended-state="6" />
-    <editor active="true" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25178826" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49534342" weight="0.46793997" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.39972714" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" weight="0.32825485" />
-      <window_info anchor="bottom" id="Docker" order="7" weight="0.3287858" />
-      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49941793" weight="0.333795" />
-      <window_info anchor="bottom" id="Database Changes" order="9" />
-      <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50465655" side_tool="true" weight="0.46793997" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.49476135" visible="true" weight="0.30747923" />
-      <window_info anchor="bottom" id="Python Console" order="12" sideWeight="0.49767172" weight="0.3287858" />
-      <window_info anchor="bottom" id="Messages" order="13" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="SciView" order="3" />
-      <window_info anchor="right" id="Database" order="4" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="Clean build of syslog-docker" />
-    <MESSAGE value="Build with healthcheck" />
-    <MESSAGE value="compose with proper service names" />
-    <MESSAGE value="Correct healthcheck" />
-    <MESSAGE value="Working default route test case" />
-    <MESSAGE value="add circleci" />
-    <MESSAGE value="add context flag" />
-    <MESSAGE value="build in sub directory" />
-    <MESSAGE value="add submodule config" />
-    <MESSAGE value="submodules need recursive" />
-    <option name="LAST_COMMIT_MESSAGE" value="submodules need recursive" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/tests/test_poc.py</url>
-          <line>84</line>
-          <option name="timeStamp" value="8" />
-        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/tests/test_poc.py</url>
-          <line>33</line>
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/sc4s$pytest_in_tests.coverage" NAME="pytest in tests Coverage Results" MODIFIED="1561601401665" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-    <SUITE FILE_PATH="coverage/sc4s$pytest_in_tests_docker.coverage" NAME="pytest in tests docker Coverage Results" MODIFIED="1561752569703" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/package/confluent.repo">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="12" column="9" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="7" column="55" lean-forward="true" selection-start-line="7" selection-start-column="55" selection-end-line="7" selection-end-column="55" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/sources/s_defaults.conf" />
-    <entry file="file://$PROJECT_DIR$/package/sbin/entrypoint.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="152">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/syslog-ng.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="23" column="23" selection-start-line="23" selection-start-column="23" selection-end-line="23" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="38">
-            <caret line="2" selection-start-line="2" selection-end-line="2" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/goss.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/scripts/splunkmetrics.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="16" column="38" selection-start-line="16" selection-start-column="17" selection-end-line="16" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/templates/t_templates.conf">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/blocks/b_parsers.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-124">
-          <caret line="6" column="536" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="536" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/filters/f_filter.spec">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3056" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/filters/f_websense.conf">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/filters/f_palo_alto.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-947" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/filters/f_cisco-ios.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-890" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/filters/f_catchall.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-526" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/blocks/b_destinations.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-536" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/etc/conf.d/splunk.conf">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="157">
-          <caret line="35" column="23" selection-start-line="35" selection-start-column="23" selection-end-line="35" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/scripts/switch_transport.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="100">
-          <caret line="14" column="33" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/LICENSE">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="26" selection-start-column="26" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_poc.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1425">
-          <caret line="75" column="20" selection-start-line="75" selection-start-column="20" selection-end-line="75" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#30#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/LICENSE-2.0">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$USER_HOME$/Library/Caches/PyCharm2019.1/remote_sources/-1691740145/1170049292/_pytest/python.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-462">
-          <caret line="173" selection-start-line="173" selection-end-line="173" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/docker-compose.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="649">
-          <caret line="44" column="24" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/requirements.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="57">
-          <caret line="3" column="37" selection-start-line="3" selection-start-column="37" selection-end-line="3" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.circleci/config.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="21" column="28" lean-forward="true" selection-start-line="21" selection-start-column="28" selection-end-line="21" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/goss.yaml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="11" column="10" selection-start-line="11" selection-start-column="10" selection-end-line="11" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package/Dockerfile">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1587">
-          <caret line="92" column="85" selection-start-line="92" selection-start-column="81" selection-end-line="92" selection-end-column="85" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.circleci/config.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="95" column="23" selection-start-line="95" selection-start-column="23" selection-end-line="95" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bacc2d6..461faf4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,12 @@ services:
     links:
       - splunk
       - sc4s
+    volumes:
+      - sc4s-tests:/work/tests
+      - sc4s-results:/work/test-results
+
   sc4s:
+    image: rfaircloth/scs:master
     build: ./package
     hostname: sc4s
     ports:
@@ -52,3 +57,8 @@ services:
 #        splunk-index: main
 #        splunk-insecureskipverify: true
 #        splunk-verify-connection: false
+volumes:
+  sc4s-tests:
+    external: true
+  sc4s-results:
+    external: true
diff --git a/test-with-compose.sh b/test-with-compose.sh
new file mode 100755
index 0000000..f426220
--- /dev/null
+++ b/test-with-compose.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+mkdir test-results
+docker volume create sc4s-tests
+docker volume create sc4s-results
+
+docker container create --name dummy \
+        -v sc4s-tests:/work/tests \
+        -v sc4s-results:/work/test-results \
+        registry.access.redhat.com/ubi7/ubi
+docker cp tests/ dummy:/work/tests/
+docker rm dummy
+
+docker-compose build --build-arg  RH_ACTIVATION=$RH_ACTIVATION --build-arg  RH_ORG=$RH_ORG
+docker-compose up  --abort-on-container-exit --exit-code-from test
+
+docker container create --name dummy \
+        -v sc4s-tests:/work/tests \
+        -v sc4s-results:/work/test-results \
+        registry.access.redhat.com/ubi7/ubi
+
+docker cp dummy:/work/test-results/functional test-results
+docker rm dummy
+EXIT=$0
+
+
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 695362a..99b98a6 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -3,5 +3,7 @@ FROM python:3.7
 COPY requirements.txt /
 
 RUN pip3 install -r /requirements.txt
-RUN mkdir /work
-CMD python pytest
+RUN mkdir -p /work/tests
+RUN mkdir -p /work/test-results/functional
+WORKDIR /work
+CMD cd /work;python -m pytest --junitxml=/work/test-results/functional/functional.xml