Updated functional tests

Author: nicholasjackson

functional_tests/features/container.feature

@@ -8,12 +8,12 @@ Feature: Docker Container
     And there should be 1 container running called "consul.container.shipyard.run"
     And there should be 1 container running called "consul.sidecar.shipyard.run"
     And there should be 1 container running called "consul-container-http.ingress.shipyard.run"
-    And a call to "http://consul-http.ingress.shipyard.run:18500/v1/agent/members" should result in status 200
+    And a call to "http://consul-http.ingress.shipyard.run:8500/v1/agent/members" should result in status 200
 
   Scenario: Single Container from Github Blueprint
     Given I apply the config "github.com/shipyard-run/shipyard/functional_tests/test_fixtures//container"
     Then there should be 1 network called "onprem"
     And there should be 1 container running called "consul.container.shipyard.run"
     And there should be 1 container running called "consul.sidecar.shipyard.run"
-    And there should be 1 container running called "consul-http.ingress.shipyard.run"
+    And there should be 1 container running called "consul-container-http.ingress.shipyard.run"
     And a call to "http://consul-http.ingress.shipyard.run:8500/v1/agent/members" should result in status 200

functional_tests/features/module.feature

@@ -3,7 +3,7 @@ Feature: Modules
   I should apply a blueprint
 
   Scenario: Blueprint containing two modules
-    Given I apply the config "./test_fixtures/moduls"
+    Given I apply the config "./test_fixtures/modules"
     Then there should be 1 network called "onprem"
     And there should be 1 network called "cloud"
     And there should be 1 container running called "consul.container.shipyard.run"