f.diff

diff --git a/lib/fog/openstack/requests/network/create_router.rb b/lib/fog/openstack/requests/network/create_router.rb
index ca8694d..dfc8aed 100644
--- a/lib/fog/openstack/requests/network/create_router.rb
+++ b/lib/fog/openstack/requests/network/create_router.rb
@@ -39,15 +39,16 @@ module Fog
           data = {
             'router' => {
               'status' => 'ACTIVE',
-              'external_gateway_info' => null,
+              'external_gateway_info' => nil,
               'name' => 'another_router',
               'admin_state_up' => true,
               'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3',
               'id' => '8604a0de-7f6b-409a-a47c-a1cc7bc77b2e'
             }
           }
-          self.data[:routers][data['id']] = data
-          response.body = { 'router' => data }
+          self.data[:routers] = []
+          self.data[:routers] << data['router']
+          response.body = data
           response
         end
       end
diff --git a/lib/fog/openstack/requests/network/get_router.rb b/lib/fog/openstack/requests/network/get_router.rb
index 8e86817..d489e69 100644
--- a/lib/fog/openstack/requests/network/get_router.rb
+++ b/lib/fog/openstack/requests/network/get_router.rb
@@ -15,10 +15,10 @@ module Fog
       class Mock
         def get_router(router_id)
           response = Excon::Response.new
-          if data = self.data[:routers][router_id]
+          if data = (self.data[:routers].find { |r| r['id'] == router_id })
             response.status = 200
             response.body = {
-              'routers' => {
+              'router' => {
                 'status' => 'ACTIVE',
                 'external_gateway_info' => {
                   'network_id' => '3c5bcddd-6af9-4e6b-9c3e-c153e521cab8'
diff --git a/lib/fog/openstack/requests/network/list_routers.rb b/lib/fog/openstack/requests/network/list_routers.rb
index 3f692c3..de575cb 100644
--- a/lib/fog/openstack/requests/network/list_routers.rb
+++ b/lib/fog/openstack/requests/network/list_routers.rb
@@ -16,7 +16,7 @@ module Fog
       class Mock
         def list_routers(filters = {})
           Excon::Response.new(
-            :body   => { 'routers' => self.data[:routers].values },
+            :body   => { 'routers' => (self.data[:routers] || []) },
             :status => 200
           )
         end
diff --git a/lib/fog/openstack/requests/network/update_router.rb b/lib/fog/openstack/requests/network/update_router.rb
index bdcd74a..af25c77 100644
--- a/lib/fog/openstack/requests/network/update_router.rb
+++ b/lib/fog/openstack/requests/network/update_router.rb
@@ -52,7 +52,8 @@ module Fog
       end
 
       class Mock
-        def update_router(router_id, network_id, options = {})
+        def update_router(router_id, options = {})
+          raise Fog::Network::OpenStack::NotFound if router_id == 0
           response = Excon::Response.new
           response.status = 201
           data = {
@@ -65,7 +66,6 @@ module Fog
             'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3',
             'id' => '8604a0de-7f6b-409a-a47c-a1cc7bc77b2e'
           }
-          self.data[:router_id][data['router_id']] = data
           response.body = { 'router' => data }
           response
         end