Separated address book, delivery and billing addresses, updated tests