diff --git a/.mailmap b/.mailmap
index ff304c89..76e7bc66 100644
--- a/.mailmap
+++ b/.mailmap
@@ -14,6 +14,7 @@
 <code@term.ie> <github@anarkystic.com>
 <code@term.ie> <termie@preciousroy.local>
 <corywright@gmail.com> <cory.wright@rackspace.com>
+<dan@nicira.com> <danwent@dan-xs3-cs>
 <devin.carlen@gmail.com> <devcamcar@illian.local>
 <ewan.mellor@citrix.com> <emellor@silver>
 <itoumsn@nttdata.co.jp> <itoumsn@shayol>
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index b8081322..2a8f33dd 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -828,7 +828,7 @@ class ComputeTestCase(test.TestCase):
         for v in i_ref['volumes']:
             self.compute.volume_manager.remove_compute_volume(c, v['id'])
         self.mox.StubOutWithMock(self.compute.driver, 'unfilter_instance')
-        self.compute.driver.unfilter_instance(i_ref, network_info=[])
+        self.compute.driver.unfilter_instance(i_ref, [])
 
         # executing
         self.mox.ReplayAll()
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
index fca2975d..39695a1b 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -164,8 +164,8 @@ class FlatNetworkTestCase(test.TestCase):
                      'label': 'test%s' % i,
                      'mac': 'DE:AD:BE:EF:00:0%s' % i,
                      'rxtx_cap': 'DONTCARE',
-                     'create_vlan': False,
-                     'create_bridge': False}
+                     'should_create_vlan': False,
+                     'should_create_bridge': False}
             self.assertDictMatch(nw[1], check)
 
             check = [{'enabled': 'DONTCARE',