diff --git a/docs/upgrades/upgrade_7.5.2-7.5.3.pl b/docs/upgrades/upgrade_7.5.2-7.5.3.pl
index f02cd6941..93cd046a5 100644
--- a/docs/upgrades/upgrade_7.5.2-7.5.3.pl
+++ b/docs/upgrades/upgrade_7.5.2-7.5.3.pl
@@ -58,6 +58,7 @@ sub addAddressBook {
         address1 varchar(35),
         address2 varchar(35),
         address3 varchar(35),
+        city varchar(35),
         state varchar(35),
         country varchar(35),
         code varchar(35),
diff --git a/lib/WebGUI/Shop/Address.pm b/lib/WebGUI/Shop/Address.pm
index f98263b43..020d8d063 100644
--- a/lib/WebGUI/Shop/Address.pm
+++ b/lib/WebGUI/Shop/Address.pm
@@ -59,7 +59,7 @@ sub create {
     unless (defined $addressData && ref $addressData eq "HASH") {
         WebGUI::Error::InvalidParam->throw(param=>$addressData, error=>"Need a hash reference.");
     }
-    my $id = $book->session->db->setRow("addressBook","addressBookId", {addressId=>"new"});
+    my $id = $book->session->db->setRow("address","addressId", {addressId=>"new", addressBookId=>$book->getId});
     my $address = $class->new($book, $id);
     $address->update($addressData);
     return $address;
diff --git a/t/Shop/Address.pm b/t/Shop/Address.pm
new file mode 100644
index 000000000..e94d50caf
--- /dev/null
+++ b/t/Shop/Address.pm
@@ -0,0 +1,118 @@
+# vim:syntax=perl
+#-------------------------------------------------------------------
+# WebGUI is Copyright 2001-2008 Plain Black Corporation.
+#-------------------------------------------------------------------
+# Please read the legal notices (docs/legal.txt) and the license
+# (docs/license.txt) that came with this distribution before using
+# this software.
+#------------------------------------------------------------------
+# http://www.plainblack.com                     info@plainblack.com
+#------------------------------------------------------------------
+
+# Write a little about what this script tests.
+# 
+#
+
+use FindBin;
+use strict;
+use lib "$FindBin::Bin/../lib";
+use Test::More;
+use Test::Deep;
+use Exception::Class;
+
+use WebGUI::Test; # Must use this before any other WebGUI modules
+use WebGUI::Session;
+use WebGUI::Shop::AddressBook;
+
+#----------------------------------------------------------------------------
+# Init
+my $session         = WebGUI::Test->session;
+
+#----------------------------------------------------------------------------
+# Tests
+
+my $tests = 8;
+plan tests => 1 + $tests;
+
+#----------------------------------------------------------------------------
+# put your tests here
+
+my $loaded = use_ok('WebGUI::Shop::Address');
+
+my $storage;
+
+SKIP: {
+
+skip 'Unable to load module WebGUI::Shop::Address', $tests unless $loaded;
+my $e;
+my $address;
+
+#######################################################################
+#
+# create
+#
+#######################################################################
+
+eval { $address = WebGUI::Shop::Address->create(); };
+$e = Exception::Class->caught();
+isa_ok($e, 'WebGUI::Error::InvalidObject', 'create takes exception to not giving it an address book');
+cmp_deeply(
+    $e,
+    methods(
+        error    => 'Need an address book.',
+        expected => 'WebGUI::Shop::AddressBook',
+        got      => '',
+        param    => undef,
+    ),
+    'create takes exception to not giving it address book',
+);
+
+eval { $address = WebGUI::Shop::Address->create($session); };
+$e = Exception::Class->caught();
+isa_ok($e, 'WebGUI::Error::InvalidObject', 'create takes exception to not giving it a session variable');
+cmp_deeply(
+    $e,
+    methods(
+        error    => 'Need an address book.',
+        expected => 'WebGUI::Shop::AddressBook',
+        got      => 'WebGUI::Session',
+        param    => $session,
+    ),
+    'create takes exception to giving it a session variable',
+);
+
+my $book = WebGUI::Shop::AddressBook->create($session);
+
+eval { $address = WebGUI::Shop::Address->create($book); };
+$e = Exception::Class->caught();
+isa_ok($e, 'WebGUI::Error::InvalidParam', 'create takes exception to not giving it address data');
+cmp_deeply(
+    $e,
+    methods(
+        error    => 'Need a hash reference.',
+        param    => undef,
+    ),
+    'create takes exception to giving it address data',
+);
+
+$address = WebGUI::Shop::Address->create($book, {});
+isa_ok($address, 'WebGUI::Shop::Address', 'create returns an Address object with an empty hashref');
+
+cmp_deeply(
+    $address->addressBook,
+    $book,
+    'The address has a reference back to the book used to create it'
+);
+
+#######################################################################
+#
+# new
+#
+#######################################################################
+
+}
+
+END: {
+    $session->db->write('delete from addressBook');
+    $session->db->write('delete from address');
+}
diff --git a/t/Shop/AddressBook.t b/t/Shop/AddressBook.t
index 344a757d1..881674f93 100644
--- a/t/Shop/AddressBook.t
+++ b/t/Shop/AddressBook.t
@@ -43,7 +43,7 @@ my $storage;
 
 SKIP: {
 
-skip 'Unable to load module WebGUI::Shop::Tax', $tests unless $loaded;
+skip 'Unable to load module WebGUI::Shop::AddressBook', $tests unless $loaded;
 my $e;
 my $book;