diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 85ae491..669ca2a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -96,7 +96,7 @@ jobs:
       CGO_ENABLED: 1
       GOPATH: ${{ github.workspace }}/.go
       CMAKE_BUILD_PARALLEL_LEVEL: 4
-      IGNORE_PACKAGES: 'tray|docker|docs|version|webgui'
+      IGNORE_PACKAGES: 'tray|docker|docs|version|webgui|workers$'
     defaults:
       run:
         shell: bash
@@ -170,12 +170,13 @@ jobs:
       - name: Test
         run: |
           set -x
+          go list ./... | grep -E -v "${IGNORE_PACKAGES}"
           for i in $(go list ./... | grep -E -v "${IGNORE_PACKAGES}" | sed -n -e 's|github.com\/Project-Faster\/qpep\/||p')
           do
             pushd $i
             export WORKSPACE="${{ github.workspace }}"
-            go test -v -gcflags=-l -cover -c -o qpep.$(basename $PWD).test &> unit_tests.out || true
-            ./qpep.$(basename $PWD).test -test.v -test.timeout 5m -test.coverprofile=$WORKSPACE/cover/$(basename $PWD).out &>> unit_tests.out || true
+            go test -v -gcflags=-l -cover -c -o qpep.$(basename $PWD).test > unit_tests.out 2>&1 || true
+            ./qpep.$(basename $PWD).test -test.v -test.timeout 5m -test.coverprofile=$WORKSPACE/cover/$(basename $PWD).out >> unit_tests.out 2>&1 || true
             grep -E "PASS|FAIL|SKIP" unit_tests.out || true
             cat unit_tests.out | go-junit-report > $WORKSPACE/unit/$(basename $PWD).xml
             popd
diff --git a/installer-osx/qpep.yml.tpl b/installer-osx/qpep.yml.tpl
index 39344fd..a5c6ac8 100644
--- a/installer-osx/qpep.yml.tpl
+++ b/installer-osx/qpep.yml.tpl
@@ -1,28 +1,24 @@
 
-# client
-gateway: ${QPEP_GATEWAY}
-port: ${QPEP_PORT}
-apiport: 8444
-listenaddress: ${QPEP_ADDRESS}
-listenport: 9443
+client:
+  local_address: ${QPEP_GATEWAY}
+  local_port: 9443
+  gateway_address: ${QPEP_ADDRESS}
+  gateway_port: ${QPEP_PORT}
 
-# backend
-backend: ${QPEP_BACKEND}
-ccalgorithm: ${QPEP_CCA}
-ccslowstart: ${QPEP_SLOWSTART}
+protocol:
+  backend: ${QPEP_BACKEND}
+  buffersize: 512
+  idletimeout: 30s
+  ccalgorithm: ${QPEP_CCA}
+  ccslowstart: ${QPEP_SLOWSTART}
 
-# certificate
-certificate: server_cert.pem
+security:
+  certificate: server_cert.pem
 
-# default
-acks: 10
-ackdelay: 25
-congestion: 4
-decimate: 4
-decimatetime: 100
-maxretries: 50
-multistream: true
-verbose: false
-preferproxy: true
-varackdelay: 0
-threads: 4
+general:
+  api_port: 444
+  max_retries: 20
+  diverter_threads: 4
+  use_multistream: true
+  prefer_proxy: true
+  verbose: false
diff --git a/installer_osx.sh b/installer_osx.sh
index aa87b8d..e16fb45 100644
--- a/installer_osx.sh
+++ b/installer_osx.sh
@@ -61,9 +61,9 @@ if [[ ! -f "../build/qpep-tray" ]]; then
   fail "Error: No qpep-tray executable found"
 fi
 
+mkdir -p QPep.app/Contents/MacOS/config
 cp ../build/qpep QPep.app/Contents/MacOS/
 cp ../build/qpep-tray QPep.app/Contents/MacOS/
-mkdir -p QPep.app/Contents/MacOS/config
 
 export QPEP_GATEWAY=192.168.1.100
 export QPEP_ADDRESS=0.0.0.0