diff --git a/libopflex/comms/create-new-certs.sh b/libopflex/comms/create-new-certs.sh
index 8a87a2149..84f8b3842 100755
--- a/libopflex/comms/create-new-certs.sh
+++ b/libopflex/comms/create-new-certs.sh
@@ -12,7 +12,7 @@ DOMAIN=$1
 # Create root CA & Private key
 
 openssl req -x509 \
-            -sha256 -days 356 \
+            -sha256 -days 3650 \
             -nodes \
             -newkey rsa:2048 \
             -subj "/CN=${DOMAIN}/C=US/L=San Fransisco" \
@@ -75,7 +75,8 @@ openssl x509 -req \
     -in "${DOMAIN}.csr" \
     -CA test/ca.pem -CAkey rootCA.key \
     -CAcreateserial -out "${DOMAIN}.crt" \
-    -days 365 \
+    -days 3650 \
     -sha256 -extfile cert.conf
-cat "${DOMAIN}.key" > test/server.pem
-cat "${DOMAIN}.crt" >> test/server.pem
+
+cat "${DOMAIN}.crt" > test/server.pem
+cat "${DOMAIN}.key" >> test/server.pem
diff --git a/libopflex/comms/test/ca.pem b/libopflex/comms/test/ca.pem
index 4ba4ac0c4..b7a5fdf32 100644
--- a/libopflex/comms/test/ca.pem
+++ b/libopflex/comms/test/ca.pem
@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDYzCCAkugAwIBAgIURjjeaP71NIMUJ8ZO7SD01btvwXUwDQYJKoZIhvcNAQEL
+MIIDYzCCAkugAwIBAgIUMuEOTaQ82FlGXiSf/zELDV3S3QswDQYJKoZIhvcNAQEL
 BQAwQTEaMBgGA1UEAwwRbm9pcm9uZXR3b3Jrcy5jb20xCzAJBgNVBAYTAlVTMRYw
-FAYDVQQHDA1TYW4gRnJhbnNpc2NvMB4XDTIzMTAyOTEyMjQzN1oXDTI0MTAxOTEy
-MjQzN1owQTEaMBgGA1UEAwwRbm9pcm9uZXR3b3Jrcy5jb20xCzAJBgNVBAYTAlVT
+FAYDVQQHDA1TYW4gRnJhbnNpc2NvMB4XDTI1MDcxNTE2MzYyMloXDTM1MDcxMzE2
+MzYyMlowQTEaMBgGA1UEAwwRbm9pcm9uZXR3b3Jrcy5jb20xCzAJBgNVBAYTAlVT
 MRYwFAYDVQQHDA1TYW4gRnJhbnNpc2NvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAv3uHBCp0bNH6f5N82h+j/YjVZzIp/nhSKYh3LMVhs8/yuZ/lzHFj
-AZ0WcX5WEWLRtSav9wkhNUO5ekDNJVk+gJHP8fOjZlvTj+ZS56Cwg/cOpf6HJBJG
-qLSx9PmZkmnU6eSjSpgUinKemYG7C6Zga3JUN40x/0qE8w8p4xMsPlDsUukZ38JQ
-cHpZ3XNn1VQhN9t1ZEGlaIfS3vk7QZAFR2LYB01GPvXH/7qU06I4Z102elsdcoHX
-9B4hYB1c2sfT3e2vHh1E1HwteahZkegxjWE+1wBSvitqCeOuzs2B6OAilqv9hndc
-y3wmOlcm5lqs+/gq3qrxt2kMEXBAUYbblQIDAQABo1MwUTAdBgNVHQ4EFgQUmgFb
-qWSWWBy+bYEOCzuILUxoGKwwHwYDVR0jBBgwFoAUmgFbqWSWWBy+bYEOCzuILUxo
-GKwwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAcN152TNxrBJ0
-Rj26aogfQsrrstFqrBcf/Up6JwkR36PaOtJGS2EjT06YfjZx5quB60sFNptPEDEd
-rebNbKhXP/DrsbhLQtEZFEsvpW3yiMEr0mXRD4Y4mwiavBaf/Zs9GW11JIG5U9J6
-KG+RbqkactbmoiOxiexIiBBLlicRWTc/5Ccar4z1ydow1559uN7FDMq552sVA9Us
-BfSXQVVDUVyuXQ7LcRGhJsp/xyZSbotxUOmF89Que+BIyRhUO/2bXa1R+p4Lq05h
-tlzlN3YSr6BrP4ydfCLQVcZCthIl/ce3Kvx2TS2h41EEhWrcN+Z2k3oF9aMeV5k5
-X928/kak3A==
+MIIBCgKCAQEAwwS0W0f8F9K9i1kVCfz1BvxKBoFriIxaU7+ofA1V8SUP0K3B5Fp0
+y0C1nbuHhgyVVMJUWxfRIDtVCdHNPyrw6AILlYGmqXyRp/rfUhuNU9nJ34dgEPGt
+8+bbkuZqJwSeEZO4E0rJ4GE6xZCinW2RcAUmBLt4x5g8Fl1/jddSY5jNRW76uXMM
+WSf08jWqQz6wtvI9mlJvsHkZjnEBxXxqCirfAltmE1pnorzaBE7b+j5qScHAA33b
+JaevLJ84BGvdgPVIpFsUShz8oh8hX0jKCDe5GZZdimj3KqV5XInhpvuEEgb3iDU8
+6o9zVvwX2TCELi0Ssb9ZpQjrnNagnB6zDwIDAQABo1MwUTAdBgNVHQ4EFgQUAmeq
+YZnasPjZFPLQ/VES/OvTxcswHwYDVR0jBBgwFoAUAmeqYZnasPjZFPLQ/VES/OvT
+xcswDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAIeSc1HbFRIJK
+VEzvioC08qwCwM0c3NsEFkrz+wziqWiSmF9QYOnAnGT5VdUpI0zJTOmBU0AGLnTu
+Ih1NpJC19pR6BPY96F1UyB/Adzeol1yqfFD1ULF3/Tz2w7oha3ApkAWmM4Wd27Lj
+YFVPGoiVdb4l06UBsTnqtMKsgnW2EvJiwudV5akIflvfr2M0i2uUB2NszQDtCzy+
+42WZwHviHl6I/0cwQ3k8NGZrZKYy6cVpoN06mugdDVxkkCwJFOj75XBzTuFQbVgV
+l0KkSxRaohZi6FNXRpZ6pv+Z6qrg2Jkh9v+i/9kirflXmrqbRVu+rOwULPd1ePX9
+HtwlB1/I4Q==
 -----END CERTIFICATE-----
diff --git a/libopflex/comms/test/server.pem b/libopflex/comms/test/server.pem
index e26e0aa1b..eefa2b128 100644
--- a/libopflex/comms/test/server.pem
+++ b/libopflex/comms/test/server.pem
@@ -1,49 +1,51 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAvwTwoA9pNpazpLVGhV5o+inH/BlKfJALPWJpwAl6bZ6M1kWD
-HXblav0ixBfqMqRM83Q1z6VigJC7UUCbU+9LpgkF5+i4XIMxcgorqwRQL81V4Zkm
-kHyMixdpzQno4QGfV/iEKn0NjI0Brmg87rz03gvnOUxnELdQUUfFicEZajjon278
-ejoEPkdjx512js23qQRg7lyERfTPX3oy8nmZ5GXS2MwWr4XXm6vuzX4Oceq/JjA/
-VkCKs0m59N6w9i2eI15mCWF7k3i5cbt0Je7PCnm+jHxAoqzMKRgFazKrUuW7C8/h
-AZLuNNqdQqAXJqL31drprDIhwql/yaGJTbSFTwIDAQABAoIBAGTAb0aNOlpvnGso
-rfyUclxYg0Hl+RLASx1idhKzLR76fKBb46870f/famHxlzaE0I2sYuGWAuF69UID
-CKp50fXOVo4egndRP1g+IxA94ymDbWPjiqK0/tAyVjyumGVtnKUi0Fs0wFu82AEs
-u87UXXds4dWoBcicV8G3UGq7LfOHDAdhrZ86RfebNBti9USZ/r71i44f7TBQ7qaK
-iDV6qinycfxWqUbn0jKz36T0gdaup1TsqTkSi3GVM60jsVpuT0YweCjv2ouLQwdh
-xiDJG6BBA/UDzCInxfKZs+wSMxuXT5rqwlp2IlGH9qfanx1heQykRYsMNVNw8JgD
-DKE+2ckCgYEA9q9nb9XhyfyypZkxK3hcDHZlCdYewzY5ZPdAo6A1ADSGB8ThYJf4
-iesm2jXK9GByi3thr9GnSUixI2QkAD7I382gS7K/I5KspwEIF49Sk3M5XfkNOBJN
-UX8q3IBrYtX9EF0nogAHHK5jzTL+h2kTEG3P9tBR/caAPuX2v6mEbM0CgYEAxjtw
-SKB299GUiaOz1kFd4KlMyGKjLPxm2vGcSE5YAadtTGa/Q4DsKFZw9qMPJNt0YVmY
-AA19vR+sUMjL8UII3E9zEEsBvFXc4viUCc7wGB8Km9pCG63P6FAYaA3b/R6bOMFo
-AVmodW9t/azmoRPjcHtEINjiqchgh+mOturDOosCgYA5qlcrtXvKk9/PBjiQSNp7
-r1F/MyaNy6cvCv15QoIhQiXyuvtUcTIQS4ARknGXHtSn9nenegL5Bp0iAM7Jn+Ol
-LZRDHc3AqxDhGUSi/UX4Yf8PEKEecmjQnEGQuhRgTlWR9bTGEeuXsMxzs2/8h3uF
-Y6YxtBD2mehwy6EavK3QIQKBgAxMb8Dxw6/IXvDTKTsnvw1LM6pTBFCsMC1xRALw
-aWFg49UTotYrT3uJMWT75NqiiuvnRRjrvVtYdbZlXtHPCQGyJC9kl+z5XsTuKzEY
-l6jHdD8LIYLaG8YMAheilH11wqeYyD0dNOhkS2yrp3ti4n9+BlILYrSp6+NCyEns
-8sPVAoGBAOYS5Nq7KvHQpOuB2vLolyzf9xtLBP+UDXq8hDMjBKDuT79mwzjcW9qL
-aHwGsA3Kx0cDpgkHTW/K2XMyvx7kVufAL7HBchBCFDM8B25cKTA/QknCv9iOot4J
-ETs5r6MQcT4kxisGJwbytR9zWpTgQylL9y4C0IbscTZs2BeQuVpl
------END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIIDqTCCApGgAwIBAgIUKEAZwGic1krXySWeBBQVJgdDh5swDQYJKoZIhvcNAQEL
+MIIDyDCCArCgAwIBAgIUX4mIMoupwmKoSZGWERCTHdxmuuswDQYJKoZIhvcNAQEL
 BQAwQTEaMBgGA1UEAwwRbm9pcm9uZXR3b3Jrcy5jb20xCzAJBgNVBAYTAlVTMRYw
-FAYDVQQHDA1TYW4gRnJhbnNpc2NvMB4XDTIzMTAyOTEyMjQzN1oXDTI0MTAyODEy
-MjQzN1owgYAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYD
+FAYDVQQHDA1TYW4gRnJhbnNpc2NvMB4XDTI1MDcxNTE2MzYyMloXDTM1MDcxMzE2
+MzYyMlowgYAxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYD
 VQQHDA1TYW4gRnJhbnNpc2NvMREwDwYDVQQKDAhNTG9wc0h1YjEVMBMGA1UECwwM
 TWxvcHNIdWIgRGV2MRowGAYDVQQDDBFub2lyb25ldHdvcmtzLmNvbTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAL8E8KAPaTaWs6S1RoVeaPopx/wZSnyQ
-Cz1iacAJem2ejNZFgx125Wr9IsQX6jKkTPN0Nc+lYoCQu1FAm1PvS6YJBefouFyD
-MXIKK6sEUC/NVeGZJpB8jIsXac0J6OEBn1f4hCp9DYyNAa5oPO689N4L5zlMZxC3
-UFFHxYnBGWo46J9u/Ho6BD5HY8eddo7Nt6kEYO5chEX0z196MvJ5meRl0tjMFq+F
-15ur7s1+DnHqvyYwP1ZAirNJufTesPYtniNeZglhe5N4uXG7dCXuzwp5vox8QKKs
-zCkYBWsyq1LluwvP4QGS7jTanUKgFyai99Xa6awyIcKpf8mhiU20hU8CAwEAAaNZ
-MFcwHwYDVR0jBBgwFoAUmgFbqWSWWBy+bYEOCzuILUxoGKwwCQYDVR0TBAIwADAL
-BgNVHQ8EBAMCBPAwHAYDVR0RBBUwE4IRbm9pcm9uZXR3b3Jrcy5jb20wDQYJKoZI
-hvcNAQELBQADggEBAHb/0MyEGg61p6amomuwe9h5xTCWgVmGGuiRWMNpwWcjQdGT
-gMs9YfsiQLm/Jf2BIzubobQHerMuPcN6083KkA/VggOEyy5awFVDnBug5nqx5xiC
-q1WMRje+RCCZvjAadtnActS5UL8/YBj6E552rdjAhtXp9VOpntWlj+lRN7Eum8MO
-Jbp8aE/BZxAt+QRF1x80Xtgxuu3tPWoNqFMherZlxf+t2eQn/nlevgHhLjSFQUVW
-vfFZYtZabqHVJtuIt3HF9ut+KjWrBbUE9hf3atlp3GLSSUaZSMeOnzEIqs2rgo5V
-lffWiv4B2Vpm2d9rHew9B+wKVGNZRMXv3yX6ub0=
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOFZCMGNFrNE3fRCBedFdswPwEtCvEBm
+qITLdcbK1ywF/y9B8VRAFU+hI8nPutVPbnRE3aHX+vRSVar+4khu3pg36SWxCiIK
+7MeBq5YtjXB9WxmoPRJsquOJhJOSoW41JMHxBCFqa6kkFRUfnVB6Ssc5IuO0JiTe
+tCdVV0ebB3m2D5BdzuVqZPMVqPn+0sPqFRNB6uRRgQEwvMUIP77D396nx8DGujsy
+lZFZk8ggJHKfFvBQNeBLC9wrXr2f0hG05HYaRhyXMbR331yVaHNEp0g3CDd5g40W
+lNo5ISu87R9fsBVKc1+nXrkIGBW5/9m0BFJEGerl6V//Gl0ItcXMGU8CAwEAAaN4
+MHYwHwYDVR0jBBgwFoAUAmeqYZnasPjZFPLQ/VES/OvTxcswCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBPAwHAYDVR0RBBUwE4IRbm9pcm9uZXR3b3Jrcy5jb20wHQYDVR0O
+BBYEFG6+Fhx/pC1H2Eer4dng6bZEzTG9MA0GCSqGSIb3DQEBCwUAA4IBAQBek3DS
+GdAI25+d77WcummzGudVNYHyP0YlSjE2E6dv7iQ5n3oH+F9jCSOJ0z0qbjUHEB+2
+M++H9MUrHXfBcCBNceqyT/vkn+YebO3A++xeaG/mAh5f5Nw0mrLjWF102oMvRlCY
+RUbtReufcc8d8Fd+aAtnl36Q0SAsP06jJK0GT9ZnSb7jQVzw9awFILRcRIJ2zJGV
+j9d7644G892g9PPlGGtRRi9IClP6+tG/g1Fkw1tJTaXrkoe0e0fS56vX8/ctXciA
+qo76mAdjnn/FDV1Lvn2KVm6pVNF3VrkoqAKS45eTCwQi8XrGiJyHftTR0wtVXt/i
+4RRHHr2Qa8UsAP4A
 -----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDhWQjBjRazRN30
+QgXnRXbMD8BLQrxAZqiEy3XGytcsBf8vQfFUQBVPoSPJz7rVT250RN2h1/r0UlWq
+/uJIbt6YN+klsQoiCuzHgauWLY1wfVsZqD0SbKrjiYSTkqFuNSTB8QQhamupJBUV
+H51QekrHOSLjtCYk3rQnVVdHmwd5tg+QXc7lamTzFaj5/tLD6hUTQerkUYEBMLzF
+CD++w9/ep8fAxro7MpWRWZPIICRynxbwUDXgSwvcK169n9IRtOR2GkYclzG0d99c
+lWhzRKdINwg3eYONFpTaOSErvO0fX7AVSnNfp165CBgVuf/ZtARSRBnq5elf/xpd
+CLXFzBlPAgMBAAECggEAFhOnaHLekPSDvBzFwEkNYOOAJr9keviztMLMCIwxtVXn
+EKWos2TN0a3LOEe6GZC9FPX0MplatBnm26g52ffGpeoAVNl50Sj51nfNLBrNWwJk
+7OgPB6GOwljkHKMGXqolLjzi9zUaVAk9aYLd4hcBAXCHCwDIpd8NjjbtpI27F0DA
+MxYk90hqD8Xi9s6Q4HZJKME4AfxnnxfB2vKMvX91g6kR/klgRALfEsi60TmZKrQb
+aACDeaA73bgdOSoXUnyv4YUtdetQhglhP7J3+tDpvk9qtniMz0XnEG550/O7iLBj
+CLTHjY8jfpBHBBwi6+Fmk8XDF3j1Hdvl959pG7Yp6QKBgQDiLJC9vg6+/ICz2eO0
+dK8p9ohnR6u7Eo9FfuHgPec+mDvYhNl8WJNVjfLySyEWG9aSyPg///Q0WKnm3j4K
+80SG+82RNanCv5CH/gIMrzM9F2W38Z0BPk1Jq+T1eXiYThioG3eFuzgLxbF/YFrc
+WbaVsjeC0MuXmtUFeqkaRoyPxwKBgQD/EJLpQ7EpHZlVgkpMx47nj9xaHdtv3jAw
+2fXSMa/+ErQyZ5eS9Q66xhroyB56zKy4iqD3r1kI/0AKRcLtWnJDrA7TXFIIkhBr
+FU03T69i7M8eoums9U3vcQN6kQ0HbbMYmVIM/QX/zwssx1kTq4SFZ8GEIiKW4Ev/
++G1+Yqs6OQKBgFzQSP10VvzNBcvIaIcPMyqXPtaTNMfqD91G+k5ZWOH4+uYZbl52
+ws9jFwWTCxrVhbJqwmURFhe9IsvY+8Dmn4J9JpimWunOTvNfq1ulMfOp/FYF0pZG
+CNVosuaBWJm3wqqJyvyYHaHHGNXapq6yKhk4L0uBf2rRYQWEloxv0xLVAoGBAMFT
+xKa9wihR4QjpCnwLvgtSBUjg3JR8Kra8XhCFzMmdT6vszPx8dj+nLHpIRKH7ROdT
+XBKge7HQFrAylD7nkTgtz8bwcNVCMOOZb79+zIcEyzCDdu67t+jHFkXub5uz0E3S
+2Fgz6Douql+0cZXxKS8cp5cJcII/XBuWJxfmnbYxAoGAQgIWhhcHXa6AJPwgguGz
+obitiZ+VhOtwRFhwUzrG4aFboaCnnwZW3Udy/lh0Xj2iFcwqTyjoPbG9HcgKVcuD
+kZ48e3N0lq4W4GhihrmRvhsUBFfoWEdANe6GKHB9aWFkngonP5mcqf7l0s49hmvA
+H0RRERg8k8TPUmoYg5jBhK0=
+-----END PRIVATE KEY-----