diff --git a/.travis.yml b/.travis.yml
index b32f5a1..2d74957 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,10 @@ env:
     - TEST_COMMAND=$(echo $TRAVIS_REPO_SLUG | cut -d/ -f 2) # Get command name to be tested
 
 before_script:
+  - cat /etc/mysql/my.cnf | grep -i 'bind-address'
+  - sudo sed -i 's/^bind-address.*/bind-address = "0.0.0.0"/' /etc/mysql/my.cnf
+  - cat /etc/mysql/my.cnf | grep -i 'bind-address'
+  - sudo service mysql restart
   - sudo curl -L https://github.com/docker/compose/releases/download/1.22.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
   - |
     # Remove Xdebug for a huge performance increase:
@@ -17,7 +21,6 @@ before_script:
       echo "xdebug.ini does not exist"
     fi
   - ./ci/prepare.sh
-  - ./ci/add-test-certs.sh
 
 script:
   - cd "$TRAVIS_BUILD_DIR/../easyengine"
@@ -39,3 +42,6 @@ addons:
   apt:
     packages:
       - docker-ce
+
+services:
+  - mysql
diff --git a/ci/add-test-certs.sh b/ci/add-test-certs.sh
deleted file mode 100755
index 54c4bd0..0000000
--- a/ci/add-test-certs.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/env bash
-sudo mkdir -p /opt/easyengine/nginx/certs
-
-cat <<EOF | sudo tee /opt/easyengine/nginx/certs/example2.test.crt
------BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIJAOfjYN/2twJzMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMMDWV4YW1wbGUyLnRlc3QwHhcNMTgwNzEzMDgyMzEwWhcNMjgwNzEwMDgyMzEw
-WjAYMRYwFAYDVQQDDA1leGFtcGxlMi50ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA4nSZucxge7AoPQAT9x6q9wd99/Of/5Pg9wimq9F/hI41jKT/
-Go24Cjz4+qlBk1vhT9huGfGPvtU939mkEdbtuvYX1qft2LEDK/TAUFtJCXEz/qKP
-ndFWyFhOxcKaD8lsbBW9ZuE+qK1Zjc2x4LKESmi6dAk0fgcIKxy8o1C3hFVnW8Mi
-A1bzlrTZMJl9McFaLGjtEkIBAXdk0Z9xA7Vl29AWXBkRR16WpEDhxPIR5s4qKiqv
-1I32Xaeh7R8NVIm+glMfo4C+b03/hdt6FmDvmvoKjBuFOs8156NMShIeYrzOxv18
-wJTLrJXYVjiUDylcaTZhP0a1xp3feOPweS+7gwIDAQABo1AwTjAdBgNVHQ4EFgQU
-YhlFd4zw174kiNnDQM39QS5fkk0wHwYDVR0jBBgwFoAUYhlFd4zw174kiNnDQM39
-QS5fkk0wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAk3b7fwUkG1P+
-9SzU+BGXBy/VjMeCqtraZSeKKHBnqZK1AsL7osXY+/k2k5VMZNfHyOjATCpwNc06
-rhK115aHKcMpzNfaogN1xwb4/TWzC7pp9QNFJkDsIKxPBa9aYuSBlvXfKK1BOS49
-XaNC5cOdqNV5kJOU3zSqYu0P5M65rRnUQwaOvOtqknxAgsVQcfzQVfl3vFSlGMcA
-qlKifxwYo77dUp2rucY418bh2sFUIzaIFiB2cxqfOkDa70RSye5aJStvG4mxImAF
-WlZrjFDu7AwkoQSD0rkwSoOwEmrwXAAjlfGueDIq/bBLPiTptPy3zIyutT0JHV2b
-lgkJtDRf0A==
------END CERTIFICATE-----
-EOF
-
-cat <<EOF | sudo tee /opt/easyengine/nginx/certs/example2.test.key
-
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEA4nSZucxge7AoPQAT9x6q9wd99/Of/5Pg9wimq9F/hI41jKT/
-Go24Cjz4+qlBk1vhT9huGfGPvtU939mkEdbtuvYX1qft2LEDK/TAUFtJCXEz/qKP
-ndFWyFhOxcKaD8lsbBW9ZuE+qK1Zjc2x4LKESmi6dAk0fgcIKxy8o1C3hFVnW8Mi
-A1bzlrTZMJl9McFaLGjtEkIBAXdk0Z9xA7Vl29AWXBkRR16WpEDhxPIR5s4qKiqv
-1I32Xaeh7R8NVIm+glMfo4C+b03/hdt6FmDvmvoKjBuFOs8156NMShIeYrzOxv18
-wJTLrJXYVjiUDylcaTZhP0a1xp3feOPweS+7gwIDAQABAoIBAFrDNxXj10vbx9Tj
-Ih1qukU2SIPHrnoGMCVy3zKATia3xLixLNncsUXROE1m5zSDn+ObsE1PpzhqSVld
-5seLqE7F8boEJm0yTT4h466RV82kBJ3rU7qCO9Eiq7fRjmQDbCRJ9la0sqNyjzEp
-n0Ca7DDSluCJC/PzJ4/3/ZdLc7Jis0a8Klpp2OzjXsApywSindKsC4GqLCWG/ZCA
-yncAjN8BiSoUU/cd96ckqnDTgXyx5tFZSWwVNG7hb77Y/Kes9Z4oaZNCGaLGxurI
-89WPfGeEvqN0GG+S3TjUxs+n9iZvTKa/6o3eT1TH6C1eWBQoEj9EoM8Mrx/K+zYB
-JAj6cMkCgYEA/KBCB8Oj+4XL3+21MsFUkgQKQm8FRCp29N5YxlTmcnSBgasvfHXR
-WTIEojPuABjHDyO5HKJANybFN/3pq1OgWVVg4n2ubi11HOGI5lsslXpGTuwF7fXn
-hyb07Q4Ohd/assrSB43RPKXJ1F6cbpOC/YpSQzD3Wra2Hv1m70u8dCUCgYEA5Xrd
-M7grFgSvg63072+ZnnsOhdva9QnidR7i4IWri2hWCO+pnhAwu4owJdKCj4vvlVN+
-vAJqR0TImaD/uc8m61a8slF1Ndi42lyrtWYgwMh1sBqB3uzsoDln3NjokmCLH/OC
-fLvucIBACHoaz8zpQQFiNhfEw9FnGA+Jk57tzIcCgYAT9a2B44k/RDD5flSEsBW4
-e6071n26BwjjC/ZDpU2X2XCqCBZ2ZPCndXY8QpIZW9vObGohwwgD04JdjCg8Kx1O
-MZq4CmoPtnO8Vm10lduN691GOwu042rpmMBdQnEPTsJ+wduaUTAo9IhfySHe8rS0
-x4r8WBATEMCO7kKFwZwgKQKBgG6lGeipAOVB5xp3kqSry4b1UGBMTDtfw7ey57NX
-4Al8ihcO71qN9eFG1MY3xMnPr/nw4ydlhrbMPGiOjx6Y+ev4y0yzJ++Jij+G9Sem
-kV5CiTQa48mHtOPgKer7DtAdCpeiQqU/u8y0mas8rJbK9yBnuWHZff7ohWu9ehka
-RRAbAoGAa+qjNQapv6XCNeAmunhDgMBzRZhTLZrLSvdNflenEuMpkgrkHbgJJnrG
-Yvr8i0kojvoKofYPoqvno/S5ZM2QLIVCP28HkXhVSv63doMm3pcibiAagHpNYLa9
-4uwN640uFpqt7JCSOlJP7w4zx5BKXU9D9FRwri7QivBpmBHpVLk=
------END RSA PRIVATE KEY-----
-EOF
-
-cat <<EOF | sudo tee /opt/easyengine/nginx/certs/www.example3.test.crt
------BEGIN CERTIFICATE-----
-MIIDAzCCAeugAwIBAgIJAJo9QUktB2TOMA0GCSqGSIb3DQEBBQUAMBgxFjAUBgNV
-BAMMDWV4YW1wbGUzLnRlc3QwHhcNMTgwNzEzMDgyMjUxWhcNMjgwNzEwMDgyMjUx
-WjAYMRYwFAYDVQQDDA1leGFtcGxlMy50ZXN0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAxjI414PGPUf9aRSmjVywFHMHLhJGF1+Lg3YimM9fKo1WqD4T
-2mepdV9zOztUCGrszMNcpaltjf8nTSuNwEWUp9TQYufABavN3TvzNWnmT3Q5NIA0
-2v6SZVQUEskWwoDOqhudH8D6/Dk4m449UMKrN2VD3A61T6TtlkbiX6lX2e/8UfSH
-ECFZP/xAh68l/XgcsI46tfvBPDdQdSDYhFxIhRqWevOT2FVQjR63yL6uZ96SeiIH
-sntxjBnqaYTYwgN5Bjv1vbJwHqOMhZNnquVfxh/+EOd/gBQKBWiavC5HmjnVbjyT
-6V9GiGBMsdRfjf/pNjIaqjXMYyIEtFm2/SSaIQIDAQABo1AwTjAdBgNVHQ4EFgQU
-nrOjZu9o7IznjL5JHADGu/VLB7UwHwYDVR0jBBgwFoAUnrOjZu9o7IznjL5JHADG
-u/VLB7UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAqhW1cDx4Owrj
-EUJkyKBxT6aDtWUdSP7SAvfl4pRz3wdpTT6TWc6t0s3X81tRYSX3on4L4dzfpp2/
-/Hgz6LlBIQ9thznE7WnUDE7VR6A0+Grc4po2Vq20z52LGzff/yKWx3PSVjL0f/IL
-HZ2t5YpI36nHNcJFEJWlckPkcDa8tX5tsDFr50luCsvuZBGYu6pnLWEZumL/QdHC
-UVMAKtWZxf9Via6aIKqsUNdBwq7gHdiZFYyi8NSCX2yD06LtIjBzDTn9Qsch6hSD
-utaxR66cXq8laVwyHc+Z+HkG/Y7GytDdKGYUTPB/lIhqpMrJJDcJLJz10yR8zBub
-ZLuoQMvF5Q==
------END CERTIFICATE-----
-EOF
-cat <<EOF | sudo tee /opt/easyengine/nginx/certs/www.example3.test.key
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAxjI414PGPUf9aRSmjVywFHMHLhJGF1+Lg3YimM9fKo1WqD4T
-2mepdV9zOztUCGrszMNcpaltjf8nTSuNwEWUp9TQYufABavN3TvzNWnmT3Q5NIA0
-2v6SZVQUEskWwoDOqhudH8D6/Dk4m449UMKrN2VD3A61T6TtlkbiX6lX2e/8UfSH
-ECFZP/xAh68l/XgcsI46tfvBPDdQdSDYhFxIhRqWevOT2FVQjR63yL6uZ96SeiIH
-sntxjBnqaYTYwgN5Bjv1vbJwHqOMhZNnquVfxh/+EOd/gBQKBWiavC5HmjnVbjyT
-6V9GiGBMsdRfjf/pNjIaqjXMYyIEtFm2/SSaIQIDAQABAoIBABCX/dhVaRCSaW4V
-04f8XaWop848q2+jiTu9dVIT8qTOZpX5dJIRocd48V3hLrzxrtfJ94TLNafw1+qH
-HfweFz8h+zx8qMAQzVCbh1ZOgoDeezehEEvRipI/Qtr7yRMJ08O8QiB5eMoLRGkJ
-tKqBUfJ2YQMYnCeJ6HZvgt59gCR35FVzstXhAFTUPJP/kOyF/eIRGZNaBc3LZ5ah
-anWBcl+7OhcPBkYt8QCyPUFU9VxGyDe/Ei5VOasQAyfGQ92YMAPEYGH/uoND59G5
-Z7d+xvmzCEzaLFp2AsmZmvN3s3I4qUdOwSm9f2ajArUPURSybpnYoCdXvdbIWDqm
-v2jtxi0CgYEA+8ZHD07LVijalFaSc+IyOkpqs2ON3C7laljtd/tw2L5vC4gxggwC
-TkXNrJWAt/4icbc/SXjBcHF8f4Wkz7TVuKuA14XJYO2QMeFzB/wjuHam2cF6NWf0
-Z6hSEfU+ez1VaFs3tLHSMz7sRLX/3A0AKA6TKEH9UFh/6uRCCNYlyXsCgYEAyYXA
-NcHPZoWKBcKIAe4pLBDOZgkO/V5CBJ8R38TIizOJWjnzCuIyG60bq/7uVegGeWHr
-8Ajzz4rKSkmoiCXzT1s50/i7u5W9OUC9QaQYjR1FcoK543f77lZZ7RVhmHw9bACu
-iXDQQMUeTv2OJnjDghAwa2ML92vm3u76zCrEEhMCgYATqm4cfPwW88P2+DgiQxXH
-Rc7Fyk3nV+ZlgyKxT3uGAoHr9axgSw3XDU6+X0MZnAkWtsiDtaHuZX7i+w5fhvF2
-pja/Ht0W7BdqPgDdK82id+oacilYiJEnk5ctfelueOD18MIOJCGWDSEpUMn2ZzGO
-72yBJX5iyzbaow+hXxC+hwKBgEQ4fSs1oyqHxoPQqQ5OO63pOpYcNvDa+epqlzhz
-e5h0J+ldeMOUc3YfEiEVukVmuNpape6qeS8nQvgHG4CLqGSS826o45TLSjWZjvgr
-vwv2fs4XJyq0MZsrrGGwPUvLs1dem7d3c2iZ0nrXJ0oq07SyGlIgQ6rM4mlR6aE4
-UQv1AoGAPgI7RDJcqXMwG7CyIboLTyPRWsFfhN1nlALP1URK61kAkxgBusg45GEa
-k8hTB9lhcWDTbL/GVHn5JWxn8ytLPZiDR2RbJtE/Z1bagROANrFYjqJib8lyFhvt
-HYXONl5W77CPrYjOLD+Q9ZXjYYvtAxnqFNXicRMPti7Sre9SkRo=
------END RSA PRIVATE KEY-----
-EOF
diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
index cb07d22..b8470a0 100644
--- a/features/bootstrap/FeatureContext.php
+++ b/features/bootstrap/FeatureContext.php
@@ -405,6 +405,12 @@ public static function cleanup(AfterFeatureScope $scope)
 			'www.example3.test',
 			'labels.test',
 			'wpcache.test',
+			'wp-local-db.test',
+			'wp-local-redis.test',
+			'wp-local-db-redis.test',
+			'wp-remote-db-local-redis.test',
+			'wp-remote-db-global-redis.test',
+
 		];
 
 		$result = EE::launch( 'sudo bin/ee site list --format=text',false, true );
@@ -422,4 +428,32 @@ public static function cleanup(AfterFeatureScope $scope)
 			unlink('ee-old.phar');
 		}
 	}
+
+	/**
+	 * @Then Check global redis cache for :site
+	 */
+	public function checkGlobalRedisCacheOfSite($site)
+	{
+		exec("docker exec -it ee-global-redis redis-cli set 'easyengine' 'rocks'");
+		$output = exec("docker exec -it ee-global-redis redis-cli get 'easyengine'");
+		if ( '"rocks"' !== $output ) {
+			throw new Exception("Global redis not working for $site site. Getting '$output' instead of 'rock'");
+		}
+		exec("docker exec -it ee-global-redis redis-cli del 'easyengine'");
+	}
+
+	/**
+	 * @Then Check local redis cache for :site
+	 */
+	public function checkLocalRedisCacheOfSite($site)
+	{
+		$site_root_folder = EE_SITE_ROOT . '/' . $site;
+		exec("cd $site_root_folder && docker-compose exec redis redis-cli set 'easyengine' 'rocks'");
+		$output = exec("cd $site_root_folder && docker-compose exec redis redis-cli get 'easyengine'");
+		if ( '"rocks"' !== $output ) {
+			throw new Exception("Local redis not working for $site site. Getting '$output' instead of 'rock'.");
+		}
+		exec("cd $site_root_folder && docker-compose exec redis redis-cli del 'easyengine'");
+	}
+
 }
diff --git a/features/site.feature b/features/site.feature
index f996305..ee5f0d7 100644
--- a/features/site.feature
+++ b/features/site.feature
@@ -17,6 +17,13 @@ Feature: Site Command
     usage: ee site
     """
 
+  Scenario: Check site create sub command is present
+    When I run 'bin/ee site create'
+    Then STDOUT should return exactly
+    """
+    usage: ee site create <site-name> [--ssl=<value>] [--wildcard] [--type=<type>] [--skip-status-check]
+    """
+
   Scenario: Create wp site successfully
     When I run 'bin/ee site create wp.test --type=wp'
     Then After delay of 5 seconds
@@ -26,7 +33,7 @@ Feature: Site Command
         | header           |
         | HTTP/1.1 200 OK  |
 
-  Scenario: Create wp site successfully
+  Scenario: Create wp cache site successfully
     When I run 'bin/ee site create wpcache.test --type=wp --cache'
     Then After delay of 5 seconds
     And The site 'wpcache.test' should have webroot
@@ -34,7 +41,7 @@ Feature: Site Command
     And Request on 'wpcache.test' should contain following headers:
       | header           |
       | HTTP/1.1 200 OK  |
-  
+
   Scenario: Create wpsubdir site successfully
     When I run 'bin/ee site create wpsubdir.test --type=wp --mu=subdir'
       And I create subsite '1' in 'wpsubdir.test'
@@ -67,6 +74,102 @@ Feature: Site Command
     wpsubdom.test
     """
 
+  Scenario: Check site disable sub command is present
+    When I run 'bin/ee site disable'
+    Then STDERR should return something like
+    """
+    Error: Could not find the site you wish to run site disable command on.
+    Either pass it as an argument: `ee site disable <site-name>`
+    or run `ee site disable` from inside the site folder.
+    """
+
+  Scenario: Disable the site
+    When I run 'bin/ee site disable wp.test'
+    Then STDOUT should return exactly
+    """
+    Disabling site wp.test.
+    Success: Site wp.test disabled.
+    """
+    And Request on 'wp.test' should contain following headers:
+        | header                                       |
+        | HTTP/1.1 503 Service Temporarily Unavailable |
+
+  Scenario: Check site reload sub command is present
+    When I run 'bin/ee site reload'
+    Then STDERR should return something like
+    """
+    Error: Could not find the site you wish to run site reload command on.
+    Either pass it as an argument: `ee site reload <site-name>`
+    or run `ee site reload` from inside the site folder.
+    """
+
+  Scenario: Reload site services
+    When I run 'bin/ee site reload wp.test'
+    Then STDERR should return something like
+    """
+    Error: Site wp.test is not enabled. Use `ee site enable wp.test` to enable it.
+    """
+
+  Scenario: Check site enable sub command is present
+    When I run 'bin/ee site enable'
+    Then STDERR should return something like
+    """
+    Error: Could not find the site you wish to run site enable command on.
+    Either pass it as an argument: `ee site enable <site-name>`
+    or run `ee site enable` from inside the site folder.
+    """
+
+  Scenario: Enable the site
+    When I run 'bin/ee site enable wp.test'
+    Then STDOUT should return exactly
+    """
+    Enabling site wp.test.
+    Success: Site wp.test enabled.
+    Running post enable configurations.
+    Starting site's services.
+    Success: Post enable configurations complete.
+    """
+    And Request on 'wp.test' should contain following headers:
+        | header           |
+        | HTTP/1.1 200 OK  |
+
+  Scenario: Check site info sub command is present
+    When I run 'bin/ee site info'
+    Then STDERR should return something like
+    """
+    Error: Could not find the site you wish to run site info command on.
+    Either pass it as an argument: `ee site info <site-name>`
+    or run `ee site info` from inside the site folder.
+    """
+
+  Scenario: Details of the site uing site info command
+    When I run 'bin/ee site info wp.test'
+    Then STDOUT should return something like
+    """
+    | Site               | http://wp.test
+    """
+
+  Scenario: Reload site services
+    When I run 'bin/ee site reload wp.test'
+    Then STDOUT should return something like
+    """
+    Reloading nginx
+    """
+
+  Scenario: Reload site nginx services
+    When I run 'bin/ee site reload wp.test --nginx'
+    Then STDOUT should return something like
+    """
+    Reloading nginx
+    """
+
+  Scenario: Check site delete sub command is present
+    When I run 'bin/ee site delete'
+    Then STDOUT should return exactly
+    """
+    usage: ee site delete <site-name> [--yes]
+    """
+
   Scenario: Delete the sites
     When I run 'bin/ee site delete wp.test --yes'
     Then STDOUT should return something like
@@ -85,3 +188,53 @@ Feature: Site Command
         | db         |
         | redis      |
         | phpmyadmin |
+
+  Scenario: Create WordPress site with local DB and global redis
+    When I run 'bin/ee site create wp-local-db.test --cache --type=wp --local-db'
+    Then After delay of 2 seconds
+    And The site 'wp-local-db.test' should have webroot
+    And The site 'wp-local-db.test' should have WordPress
+    And Request on 'wp-local-db.test' should contain following headers:
+      | header          |
+      | HTTP/1.1 200 OK |
+    And Check global redis cache for 'wp-local-db.test'
+
+  Scenario: Create WordPress site with local redis and global db
+    When I run 'bin/ee site create wp-local-redis.test --cache --type=wp --with-local-redis'
+    Then After delay of 2 seconds
+    And The site 'wp-local-redis.test' should have webroot
+    And The site 'wp-local-redis.test' should have WordPress
+    And Request on 'wp-local-redis.test' should contain following headers:
+      | header          |
+      | HTTP/1.1 200 OK |
+    And Check local redis cache for 'wp-local-redis.test'
+
+  Scenario: Create WordPress site with local DB and local redis
+    When I run 'bin/ee site create wp-local-db-redis.test --cache --type=wp --local-db --with-local-redis'
+    Then After delay of 2 seconds
+    And The site 'wp-local-db-redis.test' should have webroot
+    And The site 'wp-local-db-redis.test' should have WordPress
+    And Request on 'wp-local-db-redis.test' should contain following headers:
+      | header          |
+      | HTTP/1.1 200 OK |
+    And Check local redis cache for 'wp-local-db-redis.test'
+
+  Scenario: Create WordPress site with remote DB and local redis
+    When I run 'bin/ee site create wp-remote-db-local-redis.test --cache --type=wp --dbuser="root" --dbpass="" --dbhost="localhost" --with-local-redis'
+    Then After delay of 2 seconds
+    And The site 'wp-remote-db-local-redis.test' should have webroot
+    And The site 'wp-remote-db-local-redis.test' should have WordPress
+    And Request on 'wp-remote-db-local-redis.test' should contain following headers:
+      | header          |
+      | HTTP/1.1 200 OK |
+    And Check local redis cache for 'wp-remote-db-local-redis.test'
+
+  Scenario: Create WordPress site with remote DB and global redis
+    When I run 'bin/ee site create wp-remote-db-global-redis.test --cache --type=wp --dbuser="travis" --dbpass="" --dbhost="127.0.0.1"'
+    Then After delay of 2 seconds
+    And The site 'wp-remote-db-global-redis.test' should have webroot
+    And The site 'wp-remote-db-global-redis.test' should have WordPress
+    And Request on 'wp-remote-db-global-redis.test' should contain following headers:
+      | header          |
+      | HTTP/1.1 200 OK |
+    And Check global redis cache for 'wp-remote-db-global-redis.test'