From f184a71360a56d010eb63ffc406dd1f3501c8086 Mon Sep 17 00:00:00 2001
From: Bo Chen <bochen303@gmail.com>
Date: Thu, 29 Jan 2015 11:12:58 -0800
Subject: [PATCH] [TEST] test and refactor orderbooks

---
 src/js/ripple/meta.js      |    3 +-
 src/js/ripple/orderbook.js | 1124 +++++++++-----------
 test/fixtures/addresses.js |    5 +
 test/fixtures/orderbook.js |  788 ++++++++++++++
 test/metadata-test.js      |    3 +-
 test/orderbook-test.js     | 2008 +++++++++++++++++++++---------------
 6 files changed, 2472 insertions(+), 1459 deletions(-)
 create mode 100644 test/fixtures/addresses.js
 create mode 100644 test/fixtures/orderbook.js

diff --git a/src/js/ripple/meta.js b/src/js/ripple/meta.js
index 5ad3bd5b..c4f9b781 100644
--- a/src/js/ripple/meta.js
+++ b/src/js/ripple/meta.js
@@ -131,7 +131,6 @@ Meta.prototype.getNodes = function(options) {
   }
 };
 
-
 Meta.prototype.getAffectedAccounts = function(from) {
   if (this._affectedAccounts) {
     return this._affectedAccounts;
@@ -164,7 +163,7 @@ Meta.prototype.getAffectedAccounts = function(from) {
 
   this._affectedAccounts = utils.arrayUnique(accounts);
 
-  return  this._affectedAccounts;
+  return this._affectedAccounts;
 };
 
 Meta.prototype.getAffectedBooks = function() {
diff --git a/src/js/ripple/orderbook.js b/src/js/ripple/orderbook.js
index 593547d2..c04e753f 100644
--- a/src/js/ripple/orderbook.js
+++ b/src/js/ripple/orderbook.js
@@ -8,6 +8,7 @@
 //  - trade
 //  - transaction
 
+var _            = require('lodash');
 var util         = require('util');
 var extend       = require('extend');
 var assert       = require('assert');
@@ -43,18 +44,22 @@ function OrderBook(remote, getsC, getsI, paysC, paysI, key) {
   this._shouldSubscribe = true;
   this._listeners = 0;
   this._offers = [ ];
-  this._offerCounts = { };
-  this._ownerFunds = { };
-  this._ownerOffers = { };
+  this._offerCounts = {};
+  this._ownerFundsUnadjusted = {};
+  this._ownerFunds = {};
+  this._ownerOffersTotal = {};
 
   // We consider ourselves synchronized if we have a current
-  // copy of the offers, we are online and subscribed to updates.
+  // copy of the offers, we are online and subscribed to updates
   this._synchronized = false;
 
+  // Transfer rate of the taker gets currency issuer
+  this._issuerTransferRate = null;
+
   function listenersModified(action, event) {
     // Automatically subscribe and unsubscribe to orderbook
     // on the basis of existing event listeners
-    if (~OrderBook.EVENTS.indexOf(event)) {
+    if (_.contains(OrderBook.EVENTS, event)) {
       switch (action) {
         case 'add':
           if (++self._listeners === 1) {
@@ -70,6 +75,10 @@ function OrderBook(remote, getsC, getsI, paysC, paysI, key) {
     }
   };
 
+  function updateFundedAmountsWrapper (transaction) {
+    self.updateFundedAmounts(transaction);
+  };
+
   this.on('newListener', function(event) {
     listenersModified('add', event);
   });
@@ -78,15 +87,12 @@ function OrderBook(remote, getsC, getsI, paysC, paysI, key) {
     listenersModified('remove', event);
   });
 
-  function updateFundedAmounts(transaction) {
-    self.updateFundedAmounts(transaction);
-  };
-
-  this._remote.on('transaction', updateFundedAmounts);
+  this._remote.on('transaction', updateFundedAmountsWrapper);
 
   this.on('unsubscribe', function() {
     self.resetCache();
-    self._remote.removeListener('transaction', updateFundedAmounts);
+
+    self._remote.removeListener('transaction', updateFundedAmountsWrapper);
   });
 
   this._remote.once('prepare_subscribe', function() {
@@ -119,6 +125,36 @@ OrderBook.DEFAULT_TRANSFER_RATE = 1000000000;
 
 OrderBook.IOU_SUFFIX = '/000/rrrrrrrrrrrrrrrrrrrrrhoLvTp';
 
+/**
+ * Normalize offers from book_offers and transaction stream
+ *
+ * @param {Object} offer
+ * @return {Object} normalized
+ */
+
+OrderBook.offerRewrite = function(offer) {
+  var result = {};
+  var keys = Object.keys(offer);
+
+  for (var i=0, l=keys.length; i<l; i++) {
+    var key = keys[i];
+    switch (key) {
+      case 'PreviousTxnID':
+      case 'PreviousTxnLgrSeq':
+      case 'quality':
+        break;
+      default:
+        result[key] = offer[key];
+    }
+  }
+
+  result.Flags = result.Flags || 0;
+  result.OwnerNode = result.OwnerNode || new Array(16 + 1).join('0');
+  result.BookNode = result.BookNode || new Array(16 + 1).join('0');
+
+  return result;
+};
+
 /**
  * Initialize orderbook. Get orderbook offers and subscribe to transactions
  */
@@ -176,80 +212,200 @@ OrderBook.prototype.unsubscribe = function() {
 };
 
 /**
- * Reset cached owner funds, offer counts
+ * Request orderbook entries from server
+ *
+ * @param {Function} callback
+ */
+
+OrderBook.prototype.requestOffers = function(callback) {
+  var self = this;
+
+  if (typeof callback !== 'function') {
+    callback = function(){};
+  }
+
+  if (!this._shouldSubscribe) {
+    return callback(new Error('Should not request offers'));
+  }
+
+  if (this._remote.trace) {
+    log.info('requesting offers', this._key);
+  }
+
+  function handleOffers(res) {
+    if (!Array.isArray(res.offers)) {
+      // XXX What now?
+      return callback(new Error('Invalid response'));
+    }
+
+    if (self._remote.trace) {
+      log.info('requested offers', self._key, 'offers: ' + res.offers.length);
+    }
+
+    self.setOffers(res.offers);
+    self._synchronized = true;
+    self.emit('model', self._offers);
+
+    callback(null, self._offers);
+  };
+
+  function handleError(err) {
+    // XXX What now?
+    if (self._remote.trace) {
+      log.info('failed to request offers', self._key, err);
+    }
+
+    callback(err);
+  };
+
+  var request = this._remote.requestBookOffers(this.toJSON());
+  request.once('success', handleOffers);
+  request.once('error', handleError);
+  request.request();
+
+  return request;
+};
+
+/**
+ * Subscribe to transactions stream
+ *
+ * @param {Function} callback
+ */
+
+OrderBook.prototype.subscribeTransactions = function(callback) {
+  var self = this;
+
+  if (typeof callback !== 'function') {
+    callback = function(){};
+  }
+
+  if (!this._shouldSubscribe) {
+    return callback('Should not subscribe');
+  }
+
+  if (this._remote.trace) {
+    log.info('subscribing to transactions');
+  }
+
+  function handleSubscribed(res) {
+    if (self._remote.trace) {
+      log.info('subscribed to transactions');
+    }
+
+    self._subscribed = true;
+
+    callback(null, res);
+  };
+
+  function handleError(err) {
+    if (self._remote.trace) {
+      log.info('failed to subscribe to transactions', self._key, err);
+    }
+
+    callback(err);
+  };
+
+  var request = this._remote.requestSubscribe();
+  request.addStream('transactions');
+  request.once('success', handleSubscribed);
+  request.once('error', handleError);
+  request.request();
+
+  return request;
+};
+
+/**
+ * Reset cached owner's funds, offer counts, and offer sums
  */
 
 OrderBook.prototype.resetCache = function() {
-  this._ownerFunds = { };
-  this._ownerOffers = { };
-  this._offerCounts = { };
+  this._ownerFunds = {};
+  this._ownerOffersTotal = {};
+  this._offerCounts = {};
   this._synchronized = false;
 };
 
 /**
- * Check that the funds for offer owner have been cached
+ * Check whether owner's funds have been cached
  *
- * @param {String} account address
+ * @param {String} account - owner's account address
  */
 
-OrderBook.prototype.hasCachedFunds = function(account) {
+OrderBook.prototype.hasOwnerFunds = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   return this._ownerFunds[account] !== void(0);
 };
 
 /**
- * Add cached offer owner funds
+ * Set owner's, transfer rate adjusted, funds in cache
  *
- * @param {String} account address
- * @param {String} funded amount
+ * @param {String} account - owner's account address
+ * @param {String} fundedAmount
  */
 
-OrderBook.prototype.addCachedFunds = function(account, fundedAmount) {
+OrderBook.prototype.setOwnerFunds = function(account, fundedAmount) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   assert(!isNaN(fundedAmount), 'Funded amount is invalid');
-  this._ownerFunds[account] = fundedAmount;
+
+  this._ownerFundsUnadjusted[account] = fundedAmount;
+  this._ownerFunds[account] = this.applyTransferRate(fundedAmount);
 };
 
 /**
- * Get cached offer owner funds
+ * Get owner's cached, transfer rate adjusted, funds
  *
- * @param {String} account address
+ * @param {String} account - owner's account address
+ * @return {String}
  */
 
-OrderBook.prototype.getCachedFunds = function(account) {
+OrderBook.prototype.getOwnerFunds = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   return this._ownerFunds[account];
 };
 
 /**
- * Remove cached offer owner funds
+ * Get owner's cached unadjusted funds
  *
- * @param {String} account address
+ * @param {String} account - owner's account address
+ * @return {String}
  */
 
-OrderBook.prototype.removeCachedFunds = function(account) {
+OrderBook.prototype.getUnadjustedOwnerFunds = function(account) {
+  assert(UInt160.is_valid(account), 'Account is invalid');
+  return this._ownerFundsUnadjusted[account];
+};
+
+/**
+ * Remove cached owner's funds
+ *
+ * @param {String} account - owner's account address
+ */
+
+OrderBook.prototype.deleteOwnerFunds = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   this._ownerFunds[account] = void(0);
 };
 
 /**
- * Get offer count for offer owner
+ * Get offer count for owner
  *
- * @param {String} account address
+ * @param {String} account - owner's account address
+ * @return {Number}
  */
 
-OrderBook.prototype.getOfferCount = function(account) {
+OrderBook.prototype.getOwnerOfferCount = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   return this._offerCounts[account] || 0;
 };
 
 /**
- * Increment offer count for offer owner
+ * Increment offer count for owner
  *
- * @param {String} account address
+ * @param {String} account - owner's account address
+ * @return {Number}
  */
 
-OrderBook.prototype.incrementOfferCount = function(account) {
+OrderBook.prototype.incrementOwnerOfferCount = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   var result = (this._offerCounts[account] || 0) + 1;
   this._offerCounts[account] = result;
@@ -257,60 +413,72 @@ OrderBook.prototype.incrementOfferCount = function(account) {
 };
 
 /**
- * Decrement offer count for offer owner
+ * Decrement offer count for owner
+ * When an account has no more orders, we also stop tracking their account funds
  *
- * @param {String} account address
+ * @param {String} account - owner's account address
+ * @return {Number}
  */
 
-OrderBook.prototype.decrementOfferCount = function(account) {
+OrderBook.prototype.decrementOwnerOfferCount = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
   var result = (this._offerCounts[account] || 1) - 1;
   this._offerCounts[account] = result;
+
+  if (result < 1) {
+    this.deleteOwnerFunds(account);
+  }
+
   return result;
 };
 
 /**
- * Add offer amount to sum amount being offered by an account
+ * Add amount sum being offered for owner
  *
- * @param {String} account address
- * @param {Object|String} offer amount
- * @return sum
+ * @param {String} account - owner's account address
+ * @param {Object|String} amount - offer amount as native string or IOU currency format
+ * @return {Amount}
  */
 
-OrderBook.prototype.addOwnerOffer = function(account, amount) {
+OrderBook.prototype.addOwnerOfferTotal = function(account, amount) {
   assert(UInt160.is_valid(account), 'Account is invalid');
-  var previousAmount = this.getOwnerOfferSum(account);
+  var previousAmount = this.getOwnerOfferTotal(account);
   var newAmount = previousAmount.add(Amount.from_json(amount));
-  this._ownerOffers[account] = newAmount;
+  this._ownerOffersTotal[account] = newAmount;
   return newAmount;
 };
 
 /**
- * Subtract offer amount from sum amount being offered by an account
+ * Subtract amount sum being offered for owner
  *
- * @param {String} account address
- * @param {Object|String} offer amount
- * @return sum
+ * @param {String} account - owner's account address
+ * @param {Object|String} amount - offer amount as native string or IOU currency format
+ * @return {Amount}
  */
 
-OrderBook.prototype.subtractOwnerOffer = function(account, amount) {
+OrderBook.prototype.subtractOwnerOfferTotal = function(account, amount) {
   assert(UInt160.is_valid(account), 'Account is invalid');
-  var previousAmount = this.getOwnerOfferSum(account);
+  var previousAmount = this.getOwnerOfferTotal(account);
   var newAmount = previousAmount.subtract(Amount.from_json(amount));
-  this._ownerOffers[account] = newAmount;
+  this._ownerOffersTotal[account] = newAmount;
+
+  assert(!newAmount.is_negative(), 'Offer total cannot be negative');
+
   return newAmount;
 };
 
 /**
- * Get sum amount for offers by an account
+ * Get offers amount sum for owner
  *
- * @param {String} account address
- * @return sum
+ * @param {String} account - owner's account address
+ * @return {Amount}
  */
 
-OrderBook.prototype.getOwnerOfferSum = function(account) {
+OrderBook.prototype.getOwnerOfferTotal = function(account) {
   assert(UInt160.is_valid(account), 'Account is invalid');
-  var amount = this._ownerOffers[account];
+
+  var amount = this._ownerOffersTotal[account];
+  
   if (!amount) {
     if (this._currencyGets.is_native()) {
       amount = Amount.from_json('0');
@@ -318,36 +486,23 @@ OrderBook.prototype.getOwnerOfferSum = function(account) {
       amount = Amount.from_json('0' + OrderBook.IOU_SUFFIX);
     }
   }
+
   return amount;
 };
 
 /**
- * Compute funded amount for a balance/transferRate
+ * Compute adjusted balance that would be left after issuer's transfer fee is deducted
  *
  * @param {String} balance
- * @param [String] transferRate
- * @return {Amount} funded amount
+ * @return {Amount}
  */
 
-OrderBook.prototype.applyTransferRate = function(balance, transferRate) {
+OrderBook.prototype.applyTransferRate = function(balance) {
   assert(!isNaN(balance), 'Balance is invalid');
-
-  if (this._currencyGets.is_native()) {
-    return balance;
-  }
-
-  if (transferRate === void(0)) {
-    transferRate = this._issuerTransferRate;
-  }
-
-  assert(!isNaN(transferRate), 'Transfer rate is invalid');
-
-  if (transferRate === OrderBook.DEFAULT_TRANSFER_RATE) {
-    return balance;
-  }
+  assert(!_.isNull(this._issuerTransferRate) && !isNaN(this._issuerTransferRate), 'Transfer rate is invalid');
 
   var adjustedBalance = Amount.from_json(balance + OrderBook.IOU_SUFFIX)
-  .divide(transferRate)
+  .divide(this._issuerTransferRate)
   .multiply(Amount.from_json(OrderBook.DEFAULT_TRANSFER_RATE))
   .to_json()
   .value;
@@ -365,51 +520,50 @@ OrderBook.prototype.requestTransferRate = function(callback) {
   assert.strictEqual(typeof callback, 'function');
 
   var self = this;
-  var issuer = this._issuerGets;
 
   if (this._currencyGets.is_native()) {
-    // Transfer rate is default (native currency)
-    callback(null, OrderBook.DEFAULT_TRANSFER_RATE);
-    return;
+    // Transfer rate is default for the native currency
+    this._issuerTransferRate = OrderBook.DEFAULT_TRANSFER_RATE;
+
+    return callback(null, OrderBook.DEFAULT_TRANSFER_RATE);
   }
 
   if (this._issuerTransferRate) {
     // Transfer rate has already been cached
-    callback(null, this._issuerTransferRate);
-    return;
+    return callback(null, this._issuerTransferRate);
   }
 
-  this._remote.requestAccountInfo({ account: issuer }, function(err, info) {
+  this._remote.requestAccountInfo({ account: this._issuerGets }, function(err, info) {
     if (err) {
-      // XXX What now?
       return callback(err);
     }
 
-    var transferRate = info.account_data.TransferRate;
+    // When transfer rate is not explicitly set on account, it implies the default transfer rate
+    self._issuerTransferRate = info.account_data.TransferRate || OrderBook.DEFAULT_TRANSFER_RATE;
 
-    if (!transferRate) {
-      transferRate = OrderBook.DEFAULT_TRANSFER_RATE;
-    }
-
-    self._issuerTransferRate = transferRate;
-    callback(null, transferRate);
+    callback(null, self._issuerTransferRate);
   });
 };
 
 /**
- * Set funded amount on offer. All offers have taker_gets_funded property,
- * which reflects the amount this account can afford to offer. All offers have
- * is_fully_funded property, indicating whether these funds are sufficient for
- * the offer placed.
+ * Set funded amount on offer with its owner's cached funds
+ * 
+ * Offers have taker_gets_funded, reflecting the amount this account can afford to offer.
+ * Offers have is_fully_funded, indicating whether these funds are sufficient for the offer placed.
+ * Offers have taker_pays_funded, reflecting an adjusted TakerPays in the case of a partially funded order.
  *
  * @param {Object} offer
  * @param {String} funds
  * @return offer
  */
 
-OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
+OrderBook.prototype.setOfferFundedAmount = function(offer) {
   assert.strictEqual(typeof offer, 'object', 'Offer is invalid');
-  assert(!isNaN(fundedAmount), 'Funds is invalid');
+  assert(!isNaN(this.getOwnerFunds(offer.Account)), 'Funds is invalid');
+
+  var fundedAmount = this.getOwnerFunds(offer.Account);
+
+  offer.owner_funds = this.getUnadjustedOwnerFunds(offer.Account);
 
   if (fundedAmount === '0') {
     offer.taker_gets_funded = '0';
@@ -418,12 +572,9 @@ OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
     return offer;
   }
 
-  // Sum of offer amounts by an account
-  var offerSum = this.getOwnerOfferSum(offer.Account);
+  var offerSum = this.getOwnerOfferTotal(offer.Account);
 
   if (offerSum.is_zero()) {
-    // If there are no cached offer amounts for the account, default to
-    // TakerGets of this offer
     offerSum = Amount.from_json(offer.TakerGets);
   }
 
@@ -478,109 +629,12 @@ OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
 };
 
 /**
- * DEPRECATED:
- * Should only be called for old versions of rippled
+ * Get account and final balance of a meta node
  *
- * Determine what an account is funded to offer for orderbook's
- * currency/issuer
- *
- * @param {String} account
- * @param {Function} callback
+ * @param {Object} node - RippleState or AccountRoot meta node
+ * @return {Object}
  */
-
-OrderBook.prototype.requestFundedAmount = function(account, callback) {
-  assert(UInt160.is_valid(account), 'Account is invalid');
-  assert.strictEqual(typeof callback, 'function', 'Callback is invalid');
-
-  var self = this;
-
-  if (self._remote.trace) {
-    log.info('requesting funds', account);
-  }
-
-  function requestNativeBalance(callback) {
-    self._remote.requestAccountInfo({ account: account }, function(err, info) {
-      if (err) {
-        callback(err);
-      } else {
-        callback(null, String(info.account_data.Balance));
-      }
-    });
-  };
-
-  function requestLineBalance(callback) {
-    var request = self._remote.requestAccountLines({
-      account: account,
-      ledger: 'validated',
-      peer: self._issuerGets
-    });
-
-    request.request(function(err, res) {
-      if (err) {
-        return callback(err);
-      }
-
-      var currency = self._currencyGets.to_json();
-      var balance = '0';
-
-      for (var i=0, line; (line=res.lines[i]); i++) {
-        if (line.currency === currency) {
-          balance = line.balance;
-          break;
-        }
-      }
-
-      callback(null, balance);
-    });
-  };
-
-  function computeFundedAmount(err, results) {
-    if (err) {
-      if (self._remote.trace) {
-        log.info('failed to request funds', err);
-      }
-      //XXX What now?
-      return callback(err);
-    }
-
-    if (self._remote.trace) {
-      log.info('requested funds', account, results);
-    }
-
-    var balance;
-    var fundedAmount;
-
-    if (self._currencyGets.is_native()) {
-      balance = results[0];
-      fundedAmount = balance;
-    } else {
-      balance = results[1];
-      fundedAmount = self.applyTransferRate(balance, results[0]);
-    }
-
-    callback(null, fundedAmount);
-  };
-
-  var steps = [ ];
-
-  if (this._currencyGets.is_native()) {
-    steps.push(requestNativeBalance);
-  } else {
-    steps.push(this.requestTransferRate.bind(this));
-    steps.push(requestLineBalance);
-  }
-
-  async.parallel(steps, computeFundedAmount);
-};
-
-/**
- * Get changed balance of an affected node
- *
- * @param {Object} RippleState or AccountRoot node
- * @return {Object} { account, balance }
- */
-
-OrderBook.prototype.getBalanceChange = function(node) {
+OrderBook.prototype.parseAccountBalanceFromNode = function(node) {
   var result = {
     account: void(0),
     balance: void(0)
@@ -597,8 +651,9 @@ OrderBook.prototype.getBalanceChange = function(node) {
         result.account = node.fields.LowLimit.issuer;
         result.balance = node.fieldsFinal.Balance.value;
       } else if (node.fields.LowLimit.issuer === this._issuerGets) {
-        // Negate balance
         result.account = node.fields.HighLimit.issuer;
+
+        // Negate balance on the trust line
         result.balance = Amount.from_json(
           node.fieldsFinal.Balance
         ).negate().to_json().value;
@@ -606,72 +661,65 @@ OrderBook.prototype.getBalanceChange = function(node) {
       break;
   }
 
-  result.isValid = !isNaN(result.balance)
-                && UInt160.is_valid(result.account);
+  assert(!isNaN(result.balance), 'node has an invalid balance');
+  assert(UInt160.is_valid(result.account), 'node has an invalid account');
 
   return result;
 };
 
 /**
- * Check that affected node represents a balance change
+ * Check that affected meta node represents a balance change
  *
- * @param {Object} RippleState or AccountRoot node
+ * @param {Object} node - RippleState or AccountRoot meta node
  * @return {Boolean}
  */
 
-OrderBook.prototype.isBalanceChange = function(node) {
-  // Check balance change
+OrderBook.prototype.isBalanceChangeNode = function(node) {
+  // Check meta node has balance, previous balance, and final balance
   if (!(node.fields && node.fields.Balance
   && node.fieldsPrev && node.fieldsFinal
   && node.fieldsPrev.Balance && node.fieldsFinal.Balance)) {
     return false;
   }
 
-  // Check currency
+  // Check if taker gets currency is native and balance is not a number
   if (this._currencyGets.is_native()) {
     return !isNaN(node.fields.Balance);
   }
 
+  // Check if balance change is not for taker gets currency
   if (node.fields.Balance.currency !== this._currencyGets.to_json()) {
     return false;
   }
 
-  // Check issuer
+  // Check if trustline does not refer to the taker gets currency issuer
   if (!(node.fields.HighLimit.issuer === this._issuerGets
      || node.fields.LowLimit.issuer === this._issuerGets)) {
-     return false;
-   }
+    return false;
+  }
 
-   return true;
+  return true;
 };
 
 /**
- * Update funded amounts for offers in the orderbook as new transactions are
- * streamed from server
+ * Updates funded amounts/balances using ModifiedNode
  *
- * @param {Object} transaction
+ * Update owner funds using modified AccountRoot and RippleState nodes.
+ * Update funded amounts for offers in the orderbook using owner funds.
+ *
+ * @param {Object} transaction - transaction that holds meta nodes
  */
 
 OrderBook.prototype.updateFundedAmounts = function(transaction) {
   var self = this;
 
-  var affectedAccounts = transaction.mmeta.getAffectedAccounts();
-
-  var isOwnerAffected = affectedAccounts.some(function(account) {
-    return self.hasCachedFunds(account);
-  });
-
-  if (!isOwnerAffected) {
-    return;
-  }
-
   if (!this._currencyGets.is_native() && !this._issuerTransferRate) {
-    // Defer until transfer rate is requested
     if (this._remote.trace) {
       log.info('waiting for transfer rate');
     }
 
     this.requestTransferRate(function() {
+      // Defer until transfer rate is requested
       self.updateFundedAmounts(transaction);
     });
     return;
@@ -682,49 +730,233 @@ OrderBook.prototype.updateFundedAmounts = function(transaction) {
     entryType: this._currencyGets.is_native() ? 'AccountRoot' : 'RippleState'
   });
 
-  for (var i=0, l=affectedNodes.length; i<l; i++) {
-    var node = affectedNodes[i];
+  _.each(affectedNodes, function (node) {
+    if (self.isBalanceChangeNode(node)) {
+      var result = self.parseAccountBalanceFromNode(node);
 
-    if (!this.isBalanceChange(node)) {
-      continue;
+      if (self.hasOwnerFunds(result.account)) {
+        // We are only updating owner funds that are already cached
+        self.setOwnerFunds(result.account, result.balance);
+
+        self.updateOwnerOffersFundedAmount(result.account);
+      }
+    }
+  });
+};
+
+/**
+ * Update offers' funded amount with their owner's funds
+ *
+ * @param {String} account - owner's account address
+ */
+
+OrderBook.prototype.updateOwnerOffersFundedAmount = function(account) {
+  assert(UInt160.is_valid(account), 'Account is invalid');
+  assert(!isNaN(this.getOwnerFunds(account)), 'Funded amount is invalid');
+
+  var self = this;
+
+  if (this._remote.trace) {
+    log.info('updating offer funds', this._key, account, this.getOwnerFunds(account));
+  }
+
+  _.each(this._offers, function (offer) {
+    if (offer.Account !== account) {
+      return;
     }
 
-    var result = this.getBalanceChange(node);
+    // Save a copy of the old offer so we can show how the offer has changed
+    var previousOffer = extend({}, offer);
+    var previousFundedGets = Amount.from_json(
+      offer.taker_gets_funded + OrderBook.IOU_SUFFIX
+    );
 
-    if (result.isValid && this.hasCachedFunds(result.account)) {
-      this.updateAccountFunds(result.account, result.balance);
+    self.setOfferFundedAmount(offer);
+
+    var areFundsChanged = !previousFundedGets.equals(
+      Amount.from_json(offer.taker_gets_funded + OrderBook.IOU_SUFFIX)
+    );
+
+    if (areFundsChanged) {
+      self.emit('offer_changed', previousOffer, offer);
+      self.emit('offer_funds_changed', 
+        offer,
+        previousOffer.taker_gets_funded,
+        offer.taker_gets_funded
+      );
     }
+  });
+};
+
+/**
+ * Notify orderbook of a relevant transaction
+ *
+ * @param {Object} transaction
+ * @api private
+ */
+
+OrderBook.prototype.notify = function(transaction) {
+  var self = this;
+
+  if (!this._subscribed) {
+    return;
+  }
+
+  if (this._remote.trace) {
+    log.info('notifying', this._key, transaction.transaction.hash);
+  }
+
+  var affectedNodes = transaction.mmeta.getNodes({
+    entryType: 'Offer',
+    bookKey: this._key
+  });
+
+  if (affectedNodes.length < 1) {
+    return;
+  }
+
+  var takerGetsTotal = Amount.from_json(
+    '0' + ((Currency.from_json(this._currencyGets).is_native())
+           ? ''
+           : ('/' + this._currencyGets + '/' + this._issuerGets))
+  );
+
+  var takerPaysTotal = Amount.from_json(
+    '0' + ((Currency.from_json(this._currencyPays).is_native())
+           ? ''
+           : ('/' + this._currencyPays + '/' + this._issuerPays))
+  );
+
+  function handleNode(node) {
+    var isDeletedNode = node.nodeType === 'DeletedNode';
+    var isOfferCancel = transaction.transaction.TransactionType === 'OfferCancel';
+
+    switch (node.nodeType) {
+      case 'DeletedNode':
+      case 'ModifiedNode':
+        self.modifyOffer(node);
+
+        // We don't want to count an OfferCancel as a trade
+        if (!isOfferCancel) {
+          if (isDeletedNode) {
+            takerGetsTotal = takerGetsTotal.add(node.fieldsFinal.TakerGets);
+            takerPaysTotal = takerPaysTotal.add(node.fieldsFinal.TakerPays);
+          } else {
+            takerGetsTotal = takerGetsTotal.add(node.fieldsPrev.TakerGets).subtract(node.fieldsFinal.TakerGets);
+            takerPaysTotal = takerPaysTotal.add(node.fieldsPrev.TakerPays).subtract(node.fieldsFinal.TakerPays);
+          }
+        }
+        break;
+
+      case 'CreatedNode':
+        self.setOwnerFunds(node.fields.Account, transaction.transaction.owner_funds);
+        self.insertOffer(node);
+        break;
+    }
+  };
+
+  _.each(affectedNodes, handleNode);
+
+  this.emit('transaction', transaction);
+  this.emit('model', this._offers);
+  if (!takerGetsTotal.is_zero()) {
+    this.emit('trade', takerPaysTotal, takerGetsTotal);
   }
 };
 
 /**
- * Normalize offers from book_offers and transaction stream
+ * Insert an offer into the orderbook
  *
- * @param {Object} offer
- * @return {Object} normalized
+ * @param {Object} node - Offer node
  */
 
-OrderBook.offerRewrite = function(offer) {
-  var result = { };
-  var keys = Object.keys(offer);
+OrderBook.prototype.insertOffer = function(node) {
+  if (this._remote.trace) {
+    log.info('inserting offer', this._key, node.fields);
+  }
 
-  for (var i=0, l=keys.length; i<l; i++) {
-    var key = keys[i];
-    switch (key) {
-      case 'PreviousTxnID':
-      case 'PreviousTxnLgrSeq':
-      case 'quality':
+  var offer = OrderBook.offerRewrite(node.fields);
+
+  this.addOwnerOfferTotal(offer.Account, offer.TakerGets);
+  this.incrementOwnerOfferCount(offer.Account);
+
+  offer.LedgerEntryType = node.entryType;
+  offer.index = node.ledgerIndex;
+
+  this.setOfferFundedAmount(offer);
+
+  var DATE_REF = {
+    reference_date: new Date()
+  };
+
+  // XXX Should use Amount#from_quality
+  var price = Amount.from_json(
+    offer.TakerPays
+  ).ratio_human(offer.TakerGets, DATE_REF);
+
+  for (var i=0, offersLength=this._offers.length; i<offersLength + 1; i++) {
+    if (i === offersLength) {
+      this._offers.push(offer);
+    } else {
+      var currentOffer = this._offers[i];
+
+      var priceItem = Amount.from_json(
+        currentOffer.TakerPays
+      ).ratio_human(currentOffer.TakerGets, DATE_REF);
+
+      if (price.compareTo(priceItem) <= 0) {
+        this._offers.splice(i, 0, offer);
         break;
-      default:
-        result[key] = offer[key];
+      }
     }
   }
 
-  result.Flags = result.Flags || 0;
-  result.OwnerNode = result.OwnerNode || new Array(16 + 1).join('0');
-  result.BookNode = result.BookNode || new Array(16 + 1).join('0');
+  this.emit('offer_added', offer);
+};
 
-  return result;
+/**
+ * Modify an existing offer in the orderbook
+ *
+ * @param {Object} node - Offer node
+ */
+
+OrderBook.prototype.modifyOffer = function(node) {
+  if (this._remote.trace) {
+    if (node.nodeType === 'DeletedNode') {
+      log.info('deleting offer', this._key, node.fields);
+    } else {
+      log.info('modifying offer', this._key, node.fields);
+    }
+  }
+
+  for (var i=0, l=this._offers.length; i<l; i++) {
+    var offer = this._offers[i];
+
+    if (offer.index === node.ledgerIndex) {
+      if (node.nodeType === 'DeletedNode') {
+        // Remove offer amount from sum for account
+        this.subtractOwnerOfferTotal(offer.Account, offer.TakerGets);
+        this._offers.splice(i, 1);
+        this.decrementOwnerOfferCount(offer.Account);
+
+        this.emit('offer_removed', offer);
+      } else {
+        // TODO: This assumes no fields are deleted, which is
+        // probably a safe assumption, but should be checked.
+        var previousOffer = extend({}, offer);
+        extend(offer, node.fieldsFinal);
+
+        // Remove offer amount from sum for account
+        this.subtractOwnerOfferTotal(offer.Account, previousOffer.TakerGets);
+        // Add offer amount from sum for account
+        this.addOwnerOfferTotal(offer.Account, offer.TakerGets);
+
+        this.emit('offer_changed', previousOffer, offer);
+      }
+
+      break;
+    }
+  }
 };
 
 /**
@@ -735,144 +967,40 @@ OrderBook.offerRewrite = function(offer) {
  */
 
 OrderBook.prototype.setOffers = function(offers) {
-  assert(Array.isArray(offers));
+  assert(Array.isArray(offers), '');
 
-  var l = offers.length;
-  var newOffers = [ ];
+  var self = this;
 
-  for (var i=0; i<l; i++) {
-    var offer = offers[i];
-    // Add offer amount to sum for account
-    this.addOwnerOffer(offer.Account, offer.TakerGets);
-  }
+  // Must calculate offer totals before we can set funded amounts on offers
+  _.each(offers, function (rawOffer) {
+    self.addOwnerOfferTotal(rawOffer.Account, rawOffer.TakerGets);
+  });
 
-  for (var i=0; i<l; i++) {
-    var offer = OrderBook.offerRewrite(offers[i]);
-    var fundedAmount;
+  var newOffers = _.map(offers, function (rawOffer) {
+    var offer = OrderBook.offerRewrite(rawOffer);
 
-    if (this.hasCachedFunds(offer.Account)) {
-      fundedAmount = this.getCachedFunds(offer.Account);
-    } else if (offer.hasOwnProperty('owner_funds')) {
-      fundedAmount = this.applyTransferRate(offer.owner_funds);
-      this.addCachedFunds(offer.Account, fundedAmount);
+    if (offer.hasOwnProperty('owner_funds')) {
+      // The first offer from book_offers contains owner balance of offer's output
+      self.setOwnerFunds(offer.Account, offer.owner_funds);
     }
 
-    this.incrementOfferCount(offer.Account);
-    this.setFundedAmount(offer, fundedAmount);
+    self.incrementOwnerOfferCount(offer.Account);
+    self.setOfferFundedAmount(offer);
 
-    newOffers.push(offer);
-  }
+    return offer;
+  });
 
   this._offers = newOffers;
 };
 
 /**
- * Request orderbook entries from server
- */
-
-OrderBook.prototype.requestOffers = function(callback) {
-  var self = this;
-
-  if (typeof callback !== 'function') {
-    callback = function(){};
-  }
-
-  if (!this._shouldSubscribe) {
-    return callback(new Error('Should not request offers'));
-  }
-
-  if (this._remote.trace) {
-    log.info('requesting offers', this._key);
-  }
-
-  function handleOffers(res) {
-    if (!Array.isArray(res.offers)) {
-      // XXX What now?
-      return callback(new Error('Invalid response'));
-    }
-
-    if (self._remote.trace) {
-      log.info('requested offers', self._key, 'offers: ' + res.offers.length);
-    }
-
-    self.setOffers(res.offers);
-    self._synchronized = true;
-    self.emit('model', self._offers);
-
-    callback(null, self._offers);
-  };
-
-  function handleError(err) {
-    // XXX What now?
-    if (self._remote.trace) {
-      log.info('failed to request offers', self._key, err);
-    }
-
-    callback(err);
-  };
-
-  var request = this._remote.requestBookOffers(this.toJSON());
-  request.once('success', handleOffers);
-  request.once('error', handleError);
-  request.request();
-
-  return request;
-};
-
-/**
- * Subscribe to transactions stream
- */
-
-OrderBook.prototype.subscribeTransactions = function(callback) {
-  var self = this;
-
-  if (typeof callback !== 'function') {
-    callback = function(){};
-  }
-
-  if (!this._shouldSubscribe) {
-    return callback('Should not subscribe');
-  }
-
-  if (this._remote.trace) {
-    log.info('subscribing to transactions');
-  }
-
-  function handleSubscribed(res) {
-    if (self._remote.trace) {
-      log.info('subscribed to transactions');
-    }
-
-    self._subscribed = true;
-
-    callback(null, res);
-  };
-
-  function handleError(err) {
-    if (self._remote.trace) {
-      log.info('failed to subscribe to transactions', self._key, err);
-    }
-
-    callback(err);
-  };
-
-  var request = this._remote.requestSubscribe();
-  request.addStream('transactions');
-  request.once('success', handleSubscribed);
-  request.once('error', handleError);
-  request.request();
-
-  return request;
-};
-
-/**
- * Get offers model asynchronously.
+ * Get offers model asynchronously
  *
  * This function takes a callback and calls it with an array containing the
  * current set of offers in this order book.
  *
  * If the data is available immediately, the callback may be called
- * synchronously.
+ * synchronously
  *
  * @param {Function} callback
  */
@@ -908,248 +1036,6 @@ OrderBook.prototype.getOffersSync = function() {
   return this._offers;
 };
 
-/**
- * Update offers whose account's funds have changed
- *
- * @param {String} account address
- * @param {String|Object} offer funds
- */
-
-OrderBook.prototype.updateAccountFunds = function(account, balance) {
-  assert(UInt160.is_valid(account), 'Account is invalid');
-  assert(!isNaN(balance), 'Funded amount is invalid');
-
-  if (this._remote.trace) {
-    log.info('updating offer funds', this._key, account, fundedAmount);
-  }
-
-  var fundedAmount = this.applyTransferRate(balance);
-
-  // Update cached account funds
-  this.addCachedFunds(account, fundedAmount);
-
-  for (var i=0, l=this._offers.length; i<l; i++) {
-    var offer = this._offers[i];
-
-    if (offer.Account !== account) {
-      continue;
-    }
-
-    var previousOffer = extend({ }, offer);
-    var previousFundedGets = Amount.from_json(
-      offer.taker_gets_funded + OrderBook.IOU_SUFFIX
-    );
-
-    offer.owner_funds = balance;
-    this.setFundedAmount(offer, fundedAmount);
-
-    var hasChangedFunds = !previousFundedGets.equals(
-      Amount.from_json(offer.taker_gets_funded + OrderBook.IOU_SUFFIX)
-    );
-
-    if (!hasChangedFunds) {
-      continue;
-    }
-
-    this.emit('offer_changed', previousOffer, offer);
-    this.emit('offer_funds_changed', offer,
-      previousOffer.taker_gets_funded,
-      offer.taker_gets_funded
-    );
-  }
-};
-
-/**
- * Insert an offer into the orderbook
- *
- * @param {Object} node
- */
-
-OrderBook.prototype.insertOffer = function(node, fundedAmount) {
-  if (this._remote.trace) {
-    log.info('inserting offer', this._key, node.fields);
-  }
-
-  // Add offer amount to sum for account
-  this.addOwnerOffer(node.fields.Account, node.fields.TakerGets);
-
-  var nodeFields = OrderBook.offerRewrite(node.fields);
-  nodeFields.LedgerEntryType = node.entryType;
-  nodeFields.index = node.ledgerIndex;
-
-  if (!isNaN(fundedAmount)) {
-    this.setFundedAmount(nodeFields, fundedAmount);
-    this.addCachedFunds(nodeFields.Account, fundedAmount);
-  }
-
-  var DATE_REF = {
-    reference_date: new Date()
-  };
-
-  // XXX Should use Amount#from_quality
-  var price = Amount.from_json(
-    nodeFields.TakerPays
-  ).ratio_human(nodeFields.TakerGets, DATE_REF);
-
-  for (var i=0, l=this._offers.length; i<l; i++) {
-    var offer = this._offers[i];
-
-    var priceItem = Amount.from_json(
-      offer.TakerPays
-    ).ratio_human(offer.TakerGets, DATE_REF);
-
-    if (price.compareTo(priceItem) <= 0) {
-      this._offers.splice(i, 0, nodeFields);
-      break;
-    } else if (i === (l - 1)) {
-      this._offers.push(nodeFields);
-    }
-  }
-
-  this.emit('offer_added', nodeFields);
-};
-
-/**
- * Modify an existing offer in the orderbook
- *
- * @param {Object} node
- * @param {Boolean} isDeletedNode
- */
-
-OrderBook.prototype.modifyOffer = function(node, isDeletedNode) {
-  if (this._remote.trace) {
-    if (isDeletedNode) {
-      log.info('deleting offer', this._key, node.fields);
-    } else {
-      log.info('modifying offer', this._key, node.fields);
-    }
-  }
-
-  for (var i=0, l=this._offers.length; i<l; i++) {
-    var offer = this._offers[i];
-    if (offer.index === node.ledgerIndex) {
-      if (isDeletedNode) {
-        // Remove offer amount from sum for account
-        this.subtractOwnerOffer(offer.Account, offer.TakerGets);
-        this._offers.splice(i, 1);
-        this.emit('offer_removed', offer);
-      } else {
-        // TODO: This assumes no fields are deleted, which is
-        // probably a safe assumption, but should be checked.
-        var previousOffer = extend({ }, offer);
-        extend(offer, node.fieldsFinal);
-
-        // Remove offer amount from sum for account
-        this.subtractOwnerOffer(offer.Account, previousOffer.TakerGets);
-        // Add offer amount from sum for account
-        this.addOwnerOffer(offer.Account, offer.TakerGets);
-
-        this.emit('offer_changed', previousOffer, offer);
-      }
-      break;
-    }
-  }
-};
-
-/**
- * Notify orderbook of a relevant transaction
- *
- * @param {Object} transaction
- * @api private
- */
-
-OrderBook.prototype.notify = function(transaction) {
-  var self = this;
-
-  // Unsubscribed from OrderBook
-  if (!this._subscribed) {
-    return;
-  }
-
-  var affectedNodes = transaction.mmeta.getNodes({
-    entryType: 'Offer',
-    bookKey: this._key
-  });
-
-  if (affectedNodes.length < 1) {
-    return;
-  }
-
-  if (this._remote.trace) {
-    log.info('notifying', this._key, transaction.transaction.hash);
-  }
-
-  var tradeGets = Amount.from_json(
-    '0' + ((Currency.from_json(this._currencyGets).is_native())
-           ? ''
-           : ('/' + this._currencyGets + '/' + this._issuerGets))
-  );
-
-  var tradePays = Amount.from_json(
-    '0' + ((Currency.from_json(this._currencyPays).is_native())
-           ? ''
-           : ('/' + this._currencyPays + '/' + this._issuerPays))
-  );
-
-  function handleNode(node, callback) {
-    var isDeletedNode = node.nodeType === 'DeletedNode';
-    var isOfferCancel = transaction.transaction.TransactionType === 'OfferCancel';
-
-    switch (node.nodeType) {
-      case 'DeletedNode':
-      case 'ModifiedNode':
-         self.modifyOffer(node, isDeletedNode);
-
-        // We don't want to count an OfferCancel as a trade
-        if (!isOfferCancel) {
-          tradeGets = tradeGets.add(node.fieldsPrev.TakerGets);
-          tradePays = tradePays.add(node.fieldsPrev.TakerPays);
-
-          if (isDeletedNode) {
-            if (self.decrementOfferCount(node.fields.Account) < 1) {
-              self.removeCachedFunds(node.fields.Account);
-            }
-          } else {
-            tradeGets = tradeGets.subtract(node.fieldsFinal.TakerGets);
-            tradePays = tradePays.subtract(node.fieldsFinal.TakerPays);
-          }
-        }
-        callback();
-        break;
-
-      case 'CreatedNode':
-        self.incrementOfferCount(node.fields.Account);
-
-        var fundedAmount = transaction.transaction.owner_funds;
-
-        if (!isNaN(fundedAmount)) {
-          self.insertOffer(node, fundedAmount);
-          return callback();
-        }
-
-        // Get the offer account's balance from server
-        self.requestFundedAmount(
-          node.fields.Account, function(err, fundedAmount) {
-          if (err) {
-            // XXX Now what?
-          } else {
-            self.insertOffer(node, fundedAmount);
-          }
-          callback();
-        });
-        break;
-    }
-  };
-
-  async.eachSeries(affectedNodes, handleNode, function() {
-    self.emit('transaction', transaction);
-    self.emit('model', self._offers);
-    if (!tradeGets.is_zero()) {
-      self.emit('trade', tradePays, tradeGets);
-    }
-  });
-};
-
 /**
  * Get request-representation of orderbook
  *
@@ -1179,7 +1065,7 @@ OrderBook.prototype.to_json = function() {
 };
 
 /**
- * Whether the OrderBook is valid.
+ * Whether the OrderBook is valid
  *
  * Note: This only checks whether the parameters (currencies and issuer) are
  *       syntactically valid. It does not check anything against the ledger.
@@ -1199,6 +1085,4 @@ OrderBook.prototype.is_valid = function() {
   );
 };
 
-exports.OrderBook = OrderBook;
-
-// vim:sw=2:sts=2:ts=8:et
+exports.OrderBook = OrderBook;
\ No newline at end of file
diff --git a/test/fixtures/addresses.js b/test/fixtures/addresses.js
new file mode 100644
index 00000000..02723a13
--- /dev/null
+++ b/test/fixtures/addresses.js
@@ -0,0 +1,5 @@
+module.exports.ACCOUNT = 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59';
+module.exports.OTHER_ACCOUNT = 'rpZc4mVfWUif9CRoHRKKcmhu1nx2xktxBo';
+module.exports.THIRD_ACCOUNT = 'rwBYyfufTzk77zUSKEu4MvixfarC35av1J';
+module.exports.FOURTH_ACCOUNT = 'rJnZ4YHCUsHvQu7R6mZohevKJDHFzVD6Zr';
+module.exports.ISSUER = 'rMH4UxPrbuMa1spCBR98hLLyNJp4d8p4tM';
\ No newline at end of file
diff --git a/test/fixtures/orderbook.js b/test/fixtures/orderbook.js
new file mode 100644
index 00000000..75d0c19c
--- /dev/null
+++ b/test/fixtures/orderbook.js
@@ -0,0 +1,788 @@
+var _         = require('lodash');
+var addresses = require('./addresses');
+var Meta      = require('ripple-lib').Meta;
+
+module.exports.FIAT_BALANCE = '10';
+module.exports.NATIVE_BALANCE = '25';
+module.exports.NATIVE_BALANCE_PREVIOUS = '100';
+
+module.exports.TAKER_GETS = '19.84580331';
+module.exports.TAKER_GETS_FINAL = '18.84580331';
+module.exports.TAKER_PAYS = '3878342440';
+module.exports.TAKER_PAYS_FINAL = '3078342440';
+module.exports.OTHER_TAKER_GETS = '4.9656112525';
+module.exports.OTHER_TAKER_GETS_FINAL = '3.9656112525';
+module.exports.OTHER_TAKER_PAYS = '972251352';
+module.exports.OTHER_TAKER_PAYS_FINAL = '902251352';
+
+module.exports.LEDGER_INDEX = '06AFB03237286C1566CD649CFD5388C2C1F5BEFC5C3302A1962682803A9946FA';
+module.exports.OTHER_LEDGER_INDEX = 'D3338DA77BA23122FB5647B74B53636AB54BE246D4B21707C9D6887DEB334252';
+
+module.exports.TRANSFER_RATE = 1002000000;
+
+module.exports.FIAT_OFFERS = [
+  {
+    Account: addresses.ACCOUNT,
+    BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F15E821839FB',
+    BookNode: '0000000000000000',
+    Flags: 0,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000001897',
+    PreviousTxnID: '11BA57676711A42C2FC2191EAEE98023B04627DFA84926B0C8E9D61A9CAF13AD',
+    PreviousTxnLgrSeq: 8265601,
+    Sequence: 531927,
+    TakerGets: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: module.exports.TAKER_GETS
+    },
+    taker_gets_funded: '100',
+    is_fully_funded: true,
+    TakerPays: module.exports.TAKER_PAYS,
+    index: module.exports.LEDGER_INDEX,
+    owner_funds: '318.3643710638508',
+    quality: '195423807.2109563'
+  },
+  {
+    Account: addresses.ACCOUNT,
+    BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F4C3362FE1D0',
+    BookNode: '0000000000000000',
+    Flags: 0,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '00000000000063CC',
+    PreviousTxnID: 'CD77500EF28984BFC123E8A257C10E44FF486EA8FC43E1356C42BD6DB853A602',
+    PreviousTxnLgrSeq: 8265523,
+    Sequence: 1139002,
+    TakerGets: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '4.9656112525'
+    },
+    taker_gets_funded: '100',
+    is_fully_funded: true,
+    TakerPays: '972251352',
+    index: 'X2K98DB77BA23122FB5647B74B53636AB54BE246D4B21707C9D6887DEB334252',
+    owner_funds: '318.3643710638508',
+    quality: '195796912.5171664'
+  },
+  {
+    Account: addresses.OTHER_ACCOUNT,
+    BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F4C3362FE1D0',
+    BookNode: '0000000000000000',
+    Flags: 0,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '00000000000063CC',
+    PreviousTxnID: 'CD77500EF28984BFC123E8A257C10E44FF486EA8FC43E1356C42BD6DB853A602',
+    PreviousTxnLgrSeq: 8265523,
+    Sequence: 1139002,
+    TakerGets: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: module.exports.OTHER_TAKER_GETS
+    },
+    taker_gets_funded: '100',
+    is_fully_funded: true,
+    TakerPays: module.exports.OTHER_TAKER_PAYS,
+    index: module.exports.OTHER_LEDGER_INDEX,
+    owner_funds: '235.0194163432668',
+    quality: '195796912.5171664'
+  },
+];
+
+module.exports.NATIVE_OFFERS = [
+  {
+    Account: addresses.ACCOUNT,
+    BookDirectory: 'DFA3B6DDAB58C7E8E5D944E736DA4B7046C30E4F460FD9DE4C124AF94ED1781B',
+    BookNode: '0000000000000000',
+    Flags: 0,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '00000000000063CA',
+    PreviousTxnID: '51C64E0B300E9C0E877BA3E79B4ED1DBD5FDDCE58FA1A8FDA5F8DDF139787A24',
+    PreviousTxnLgrSeq: 8265275,
+    Sequence: 1138918,
+    TakerGets: '50',
+    taker_gets_funded: '100',
+    is_fully_funded: true,
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '5'
+    },
+    index: 'DC003E09AD1306FBBD1957C955EE668E429CC85B0EC0EC17297F6676E6108DE7',
+    owner_funds: '162110617177',
+    quality: '0.000000005148984210454555'
+  },
+  {
+    Account: addresses.ACCOUNT,
+    BookDirectory: 'DFA3B6DDAB58C7E8E5D944E736DA4B7046C30E4F460FD9DE4C124B054BAD1D79',
+    BookNode: '0000000000000000',
+    Flags: 0,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000001896',
+    PreviousTxnID: '9B21C7A4B66DC1CD5FC9D85C821C4CAA8F80E437582BAD11E88A1E9E6C7AA59C',
+    PreviousTxnLgrSeq: 8265118,
+    Sequence: 531856,
+    TakerGets: '10',
+    taker_gets_funded: '100',
+    is_fully_funded: true,
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '20'
+    },
+    index: '7AC0458676A54E99FAA5ED0A56CD0CB814D3DEFE1C7874F0BB39875D60668E41',
+    owner_funds: '430527438338',
+    quality: '0.000000005149035697347961'
+  },
+  {
+    Account: addresses.OTHER_ACCOUNT,
+    BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F4C3362FE1D0',
+    BookNode: '0000000000000000',
+    Flags: 0,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '00000000000063CC',
+    PreviousTxnID: 'CD77500EF28984BFC123E8A257C10E44FF486EA8FC43E1356C42BD6DB853A602',
+    PreviousTxnLgrSeq: 8265523,
+    Sequence: 1139002,
+    TakerGets: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '4.9656112525'
+    },
+    TakerPays: '972251352',
+    index: 'D3338DA77BA23122FB5647B74B53636AB54BE246D4B21707C9D6887DEB334252',
+    owner_funds: '235.0194163432668',
+    quality: '195796912.5171664'
+  },
+];
+
+module.exports.REQUEST_OFFERS = [
+  {
+    Account: addresses.ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711A3A4254F5000',
+    BookNode: '0000000000000000',
+    Flags: 131072,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000000',
+    PreviousTxnID: '9BB337CC8B34DC8D1A3FFF468556C8BA70977C37F7436439D8DA19610F214AD1',
+    PreviousTxnLgrSeq: 8342933,
+    Sequence: 195,
+    TakerGets: {
+      currency: 'BTC',
+      issuer: addresses.ISSUER,
+      value: '0.1129232560043778'
+    },
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '56.06639660617357'
+    },
+    index: 'B6BC3B0F87976370EE11F5575593FE63AA5DC1D602830DC96F04B2D597F044BF',
+    owner_funds: '0.1129267125000245',
+    quality: '496.5',
+    taker_gets_funded: {
+      currency: 'BTC',
+      issuer: addresses.ISSUER,
+      value: '0.1127013098802639'
+    },
+    taker_pays_funded: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '55.95620035555103'
+    }
+  },
+  {
+    Account: addresses.OTHER_ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+    BookNode: '0000000000000000',
+    Expiration: 461498565,
+    Flags: 131072,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000144',
+    PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
+    PreviousTxnLgrSeq: 8342469,
+    Sequence: 29354,
+    TakerGets: {
+      currency: 'BTC',
+      issuer: addresses.ISSUER,
+      value: '0.2'
+    },
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '99.72233516476456'
+    },
+    index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+    owner_funds: '0.950363009783092',
+    quality: '498.6116758238228'
+  },
+  {
+    Account: addresses.THIRD_ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+    BookNode: '0000000000000000',
+    Expiration: 461498565,
+    Flags: 131072,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000144',
+    PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
+    PreviousTxnLgrSeq: 8342469,
+    Sequence: 29356,
+    TakerGets: {
+      currency: 'BTC',
+      issuer: addresses.ISSUER,
+      value: '0.5'
+    },
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '99.72233516476456'
+    },
+    index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+    owner_funds: '0.950363009783092',
+    quality: '498.6116758238228'
+  },
+  {
+    Account: addresses.THIRD_ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+    BookNode: '0000000000000000',
+    Expiration: 461498565,
+    Flags: 131078,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000144',
+    PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
+    PreviousTxnLgrSeq: 8342469,
+    Sequence: 29354,
+    TakerGets: {
+      currency: 'BTC',
+      issuer: addresses.ISSUER,
+      value: '0.5'
+    },
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '99.72233516476456'
+    },
+    index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+    owner_funds: '0.950363009783092',
+    quality: '498.6116758238228'
+  }
+];
+
+module.exports.REQUEST_OFFERS_NATIVE = [
+  {
+    Account: addresses.ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711A3A4254F5000',
+    BookNode: '0000000000000000',
+    Flags: 131072,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000000',
+    Sequence: 195,
+    TakerGets: '1000',
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '56.06639660617357'
+    },
+    index: 'B6BC3B0F87976370EE11F5575593FE63AA5DC1D602830DC96F04B2D597F044BF',
+    owner_funds: '600'
+  },
+  {
+    Account: addresses.OTHER_ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+    BookNode: '0000000000000000',
+    Expiration: 461498565,
+    Flags: 131072,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000144',
+    Sequence: 29354,
+    TakerGets: '2000',
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '99.72233516476456'
+    },
+    index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+    owner_funds: '4000',
+  },
+  {
+    Account: addresses.THIRD_ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+    BookNode: '0000000000000000',
+    Expiration: 461498565,
+    Flags: 131072,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000144',
+    Sequence: 29356,
+    TakerGets: '2000',
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '99.72233516476456'
+    },
+    index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+    owner_funds: '3900',
+  },
+  {
+    Account: addresses.THIRD_ACCOUNT,
+    BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+    BookNode: '0000000000000000',
+    Expiration: 461498565,
+    Flags: 131078,
+    LedgerEntryType: 'Offer',
+    OwnerNode: '0000000000000144',
+    PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
+    PreviousTxnLgrSeq: 8342469,
+    Sequence: 29354,
+    TakerGets: '2000',
+    TakerPays: {
+      currency: 'USD',
+      issuer: addresses.ISSUER,
+      value: '99.72233516476456'
+    },
+    index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+    quality: '498.6116758238228'
+  }
+];
+
+module.exports.BOOK_OFFERS_RESPONSE = {
+  offers: [
+    {
+      Account: addresses.ACCOUNT,
+      BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5C188F5B29EE1C14',
+      BookNode: '0000000000000000',
+      Flags: 0,
+      LedgerEntryType: 'Offer',
+      OwnerNode: '0000000000006762',
+      PreviousTxnID: '5F08192C82CD3A598D29B51FCCDE29B6709EBCB454A3CD540C32F7A79EE7CB26',
+      PreviousTxnLgrSeq: 11558364,
+      Sequence: 1689777,
+      TakerGets: {
+        currency: 'USD',
+        issuer: addresses.ISSUER,
+        value: '79.39192374'
+      },
+      TakerPays: '5488380479',
+      index: 'D9F821C8687E0D0EDEFF05EBB53CFDC81C5F9C4C354DAACB11F6676B5E14AEF5',
+      owner_funds: '2010.027702881682',
+      quality: '69130211.4932226'
+    },
+    {
+      Account: addresses.OTHER_ACCOUNT,
+      BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5C18949C72B26C2A',
+      BookNode: '0000000000000000',
+      Flags: 0,
+      LedgerEntryType: 'Offer',
+      OwnerNode: '0000000000000001',
+      PreviousTxnID: '038ED9ACC10211A8F6768729F36B74729CECCD33057837E160131675B272E532',
+      PreviousTxnLgrSeq: 11558374,
+      Sequence: 931088,
+      TakerGets: {
+        currency: 'USD',
+        issuer: addresses.ISSUER,
+        value: '24.060765960393'
+      },
+      TakerPays: '1664716059',
+      index: '8845F212A8B53004A14C8C029FAF51B53266C66B49281A72F6A8F41CD92FDE99',
+      owner_funds: '24.06086596039299',
+      quality: '69187991.0116049',
+      taker_gets_funded: {
+        currency: 'USD',
+        issuer: addresses.ISSUER,
+        value: '24.01284027983332'
+      },
+      taker_pays_funded: '1661400177'
+    },
+    {
+      Account: addresses.THIRD_ACCOUNT,
+      BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5C18949C764EA14E',
+      BookNode: '0000000000000000',
+      Flags: 0,
+      LedgerEntryType: 'Offer',
+      OwnerNode: '0000000000000009',
+      PreviousTxnID: '62B96C0E0D86827BCE59ABDCAD146CC0B09404FE5BC86E712FB6F4E473016C63',
+      PreviousTxnLgrSeq: 11558234,
+      Sequence: 617872,
+      TakerGets: {
+        currency: 'USD',
+        issuer: addresses.ISSUER,
+        value: '712.60995'
+      },
+      TakerPays: '49304051247',
+      index: '9E5C13908F67146AC35A711A17E5EB75771FDDA816C9532891DC90F29A6A4C10',
+      owner_funds: '9071.40090264774',
+      quality: '69187991.61729358'
+    },
+    {
+      Account: addresses.FOURTH_ACCOUNT,
+      BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5C18AA2E761B7EE6',
+      BookNode: '0000000000000000',
+      Flags: 0,
+      LedgerEntryType: 'Offer',
+      OwnerNode: '0000000000000511',
+      PreviousTxnID: 'F18AED5EC1E7529EF03AF23ADA85F7625AA308278BACE1851F336443AA3DAAEA',
+      PreviousTxnLgrSeq: 11558336,
+      Sequence: 662712,
+      TakerGets: {
+        currency: 'USD',
+        issuer: addresses.ISSUER,
+        value: '288.08'
+      },
+      TakerPays: '20000000000',
+      index: '606B3FC9199D5122F1DCC73EC1629E40C8A838D58AC67315A78D76699D960705',
+      owner_funds: '7244.053477923128',
+      quality: '69425159.67786726'
+    },
+    {
+      Account: addresses.ACCOUNT,
+      BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5C18C3D9EF58005A',
+      BookNode: '0000000000000000',
+      Flags: 0,
+      LedgerEntryType: 'Offer',
+      OwnerNode: '0000000000006762',
+      PreviousTxnID: 'E3A0240001B03E4F16C4BA6C2B0CB00C01413BE331ABE9E782B6A975DC936618',
+      PreviousTxnLgrSeq: 11558318,
+      Sequence: 1689755,
+      TakerGets: {
+        currency: 'USD',
+        issuer: addresses.ISSUER,
+        value: '196.460002'
+      },
+      TakerPays: '13694716399',
+      index: '9A5D0AA37EA0889B876E9A3E552CACDB28BA5A3CD482A528992CD0CCFC09F6E8',
+      quality: '69707402.31897178'
+    }
+  ]
+};
+
+module.exports.MODIFIED_NODES = [
+  {
+    ModifiedNode: {
+      FinalFields: {
+        Account: addresses.ACCOUNT,
+        BookDirectory: 'E2B91A0A170BCC2BEC5C44B492D9B672888D9267A900330F5C08953CAA35D973',
+        BookNode: '0000000000000000',
+        Flags: 131072,
+        OwnerNode: '0000000000000001',
+        Sequence: 538,
+        TakerGets: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: module.exports.TAKER_GETS_FINAL
+        },
+        TakerPays: module.exports.TAKER_PAYS_FINAL
+      },
+      LedgerEntryType: 'Offer',
+      LedgerIndex: module.exports.LEDGER_INDEX,
+      PreviousFields: {
+        TakerGets: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: module.exports.TAKER_GETS
+        },
+        TakerPays: module.exports.TAKER_PAYS
+      },
+      PreviousTxnID: '5135DF8678727A70491DE512E5F0FE586E7C1E866492293B8898BF8191CFCAEB',
+      PreviousTxnLgrSeq: 11676651
+    }
+  },
+  {
+    ModifiedNode: {
+      FinalFields: {
+        Account: addresses.OTHER_ACCOUNT,
+        BookDirectory: 'E2B91A0A170BCC2BEC5C44B492D9B672888D9267A900330F5C08953CAA35D973',
+        BookNode: '0000000000000000',
+        Flags: 131072,
+        OwnerNode: '0000000000000001',
+        Sequence: 538,
+        TakerGets: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: module.exports.OTHER_TAKER_GETS_FINAL
+        },
+        TakerPays: module.exports.OTHER_TAKER_PAYS_FINAL
+      },
+      LedgerEntryType: 'Offer',
+      LedgerIndex: module.exports.OTHER_LEDGER_INDEX,
+      PreviousFields: {
+        TakerGets: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: module.exports.OTHER_TAKER_GETS
+        },
+        TakerPays: module.exports.OTHER_TAKER_PAYS
+      },
+      PreviousTxnID: '5135DF8678727A70491DE512E5F0FE586E7C1E866492293B8898BF8191CFCAEB',
+      PreviousTxnLgrSeq: 11676651
+    }
+  }
+];
+
+module.exports.transactionWithRippleState = function(options) {
+  options = options || {};
+  _.defaults(options, {
+    issuer: addresses.ISSUER,
+    account: addresses.ACCOUNT,
+    balance: module.exports.FIAT_BALANCE
+  });
+
+  return {
+    mmeta: new Meta({
+      AffectedNodes: [{
+        ModifiedNode: {
+          FinalFields: {
+            Balance: {
+              currency: 'USD',
+              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              value: options.balance
+            },
+            Flags: 131072,
+            HighLimit: {
+              currency: 'USD',
+              issuer: options.issuer,
+              value: '100'
+            },
+            HighNode: '0000000000000000',
+            LowLimit: {
+              currency: 'USD',
+              issuer: options.account,
+              value: '0'
+            },
+            LowNode: '0000000000000000'
+          },
+          PreviousFields: {
+            Balance: {
+              currency: 'USD',
+              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              value: '0'
+            }
+          },
+          LedgerEntryType: 'RippleState',
+          LedgerIndex: 'EA4BF03B4700123CDFFB6EB09DC1D6E28D5CEB7F680FB00FC24BC1C3BB2DB959',
+          PreviousTxnID: '53354D84BAE8FDFC3F4DA879D984D24B929E7FEB9100D2AD9EFCD2E126BCCDC8',
+          PreviousTxnLgrSeq: 343570
+        }
+      }]
+    })
+  };
+};
+
+module.exports.transactionWithAccountRoot = function(options) {
+  options = options || {};
+  _.defaults(options, {
+    account: addresses.ACCOUNT,
+    balance: module.exports.NATIVE_BALANCE,
+    previous_balance: module.exports.NATIVE_BALANCE_PREVIOUS
+  });
+
+  return {
+    mmeta: new Meta({
+      AffectedNodes: [{
+        ModifiedNode: {
+          FinalFields: {
+            Account: options.account,
+            Balance: options.balance,
+            Flags: 0,
+            OwnerCount: 1,
+            Sequence: 2
+          },
+          LedgerEntryType: 'AccountRoot',
+          LedgerIndex: '4F83A2CF7E70F77F79A307E6A472BFC2585B806A70833CCD1C26105BAE0D6E05',
+          PreviousFields: {
+            Balance: options.previous_balance,
+            OwnerCount: 0,
+            Sequence: 1
+          },
+          PreviousTxnID: 'B24159F8552C355D35E43623F0E5AD965ADBF034D482421529E2703904E1EC09',
+          PreviousTxnLgrSeq: 16154
+        }
+      }]
+    })
+  };
+};
+
+module.exports.transactionWithInvalidAccountRoot = function(options) {
+  options = options || {};
+  _.defaults(options, {
+    account: addresses.ACCOUNT,
+    balance: module.exports.NATIVE_BALANCE,
+  });
+
+  return {
+    mmeta: new Meta({
+      AffectedNodes: [{
+        ModifiedNode: {
+          FinalFields: {
+            Account: options.account,
+            Balance: options.balance,
+            Flags: 0,
+            OwnerCount: 3,
+            Sequence: 188
+          },
+          LedgerEntryType: 'AccountRoot',
+          LedgerIndex: 'B33FDD5CF3445E1A7F2BE9B06336BEBD73A5E3EE885D3EF93F7E3E2992E46F1A',
+          PreviousTxnID: 'E9E1988A0F061679E5D14DE77DB0163CE0BBDC00F29E396FFD1DA0366E7D8904',
+          PreviousTxnLgrSeq: 195455
+        }
+      }]
+    })
+  };
+};
+
+module.exports.transactionWithCreatedOffer = function(options) {
+  options = options || {};
+  _.defaults(options, {
+    account: addresses.ACCOUNT,
+    amount: '1.9951'
+  });
+
+  var meta = new Meta({
+    AffectedNodes: [
+      {
+        CreatedNode: {
+          LedgerEntryType: 'Offer',
+          LedgerIndex: 'AF3C702057C9C47DB9E809FD8C76CD22521012C5CC7AE95D914EC9E226F1D7E5',
+          NewFields: {
+            Account: options.account,
+            BookDirectory: '7B73A610A009249B0CC0D4311E8BA7927B5A34D86634581C5F211CEE1E0697A0',
+            Flags: 131072,
+            Sequence: 1404,
+            TakerGets: {
+              currency: 'USD',
+              issuer: addresses.ISSUER,
+              value: options.amount
+            },
+            TakerPays: module.exports.TAKER_PAYS
+          }
+        }
+      }
+    ]
+  });
+
+  meta.getAffectedBooks();
+
+  return {
+    mmeta: meta,
+    transaction: {
+      TransactionType: 'OfferCreate',
+      owner_funds: '2010.027702881682'
+    }
+  }
+};
+
+module.exports.transactionWithDeletedOffer = function(options) {
+  options = options || {};
+  _.defaults(options, {
+    transaction_type: 'OfferCreate'
+  });
+
+  var meta = new Meta({
+    AffectedNodes: [
+      {
+        DeletedNode: {
+          FinalFields: {
+            Account: addresses.ACCOUNT,
+            BookDirectory: '3B95C29205977C2136BBC70F21895F8C8F471C8522BF446E570463F9CDB31517',
+            BookNode: '0000000000000000',
+            Expiration: 477086871,
+            Flags: 131072,
+            OwnerNode: '0000000000000979',
+            PreviousTxnID: 'DDD2AB60A2AA1690A6CB99B094BFD2E39A81AFF2AA91B5E4049D2C96A4BC8EBA',
+            PreviousTxnLgrSeq: 11674760,
+            Sequence: 85006,
+            TakerGets: {
+              currency: 'USD',
+              issuer: addresses.ISSUER,
+              value: module.exports.TAKER_GETS
+            },
+            TakerPays: module.exports.TAKER_PAYS
+          },
+          LedgerEntryType: 'Offer',
+          LedgerIndex: module.exports.LEDGER_INDEX
+        }
+      }
+    ]
+  });
+
+  meta.getAffectedBooks();
+
+  return {
+    mmeta: meta,
+    transaction: {
+      TransactionType: options.transaction_type,
+      owner_funds: '2010.027702881682'
+    }
+  }
+};
+
+module.exports.transactionWithModifiedOffer = function() {
+  var meta = new Meta({
+    AffectedNodes: module.exports.MODIFIED_NODES.slice(0, 1)
+  });
+
+  meta.getAffectedBooks();
+
+  return {
+    mmeta: meta,
+    transaction: {
+      TransactionType: 'OfferCreate',
+      owner_funds: '2010.027702881682'
+    }
+  }
+};
+
+module.exports.transactionWithModifiedOffers = function() {
+  var meta = new Meta({
+    AffectedNodes: module.exports.MODIFIED_NODES
+  });
+
+  meta.getAffectedBooks();
+
+  return {
+    mmeta: meta,
+    transaction: {
+      TransactionType: 'OfferCreate',
+      owner_funds: '2010.027702881682'
+    }
+  }
+};
+
+module.exports.transactionWithNoNodes = function() {
+  var meta = new Meta({
+    AffectedNodes: []
+  });
+
+  meta.getAffectedBooks();
+
+  return {
+    mmeta: meta,
+    transaction: {
+      TransactionType: 'OfferCreate',
+      owner_funds: '2010.027702881682'
+    }
+  }
+};
+
+module.exports.accountInfoResponse = function(options) {
+  options = options || {};
+  _.defaults(options, {
+    account: addresses.ISSUER
+  });
+
+  return {
+    account_data: {
+      Account: options.account,
+      Balance: '6156166959471',
+      Domain: '6269747374616D702E6E6574',
+      EmailHash: '5B33B93C7FFE384D53450FC666BB11FB',
+      Flags: 131072,
+      LedgerEntryType: 'AccountRoot',
+      OwnerCount: 0,
+      PreviousTxnID: '6A7D0AB36CBA6884FDC398254BC67DE7E0B4887E9B0252568391102FBB854C09',
+      PreviousTxnLgrSeq: 8344426,
+      Sequence: 561,
+      TransferRate: module.exports.TRANSFER_RATE,
+      index: 'B7D526FDDF9E3B3F95C3DC97C353065B0482302500BBB8051A5C090B596C6133',
+      urlgravatar: 'http:www.gravatar.com/avatar/5b33b93c7ffe384d53450fc666bb11fb'
+    }
+  };
+};
\ No newline at end of file
diff --git a/test/metadata-test.js b/test/metadata-test.js
index a8c3c4fa..ae3b1ac7 100644
--- a/test/metadata-test.js
+++ b/test/metadata-test.js
@@ -33,5 +33,4 @@ describe('Meta', function() {
       assert.strictEqual(meta.nodes[idx], curr);
     }, []);
   });
-
-});
+});
\ No newline at end of file
diff --git a/test/orderbook-test.js b/test/orderbook-test.js
index b14c4824..5a473237 100644
--- a/test/orderbook-test.js
+++ b/test/orderbook-test.js
@@ -3,32 +3,37 @@ var Remote  = require('ripple-lib').Remote;
 var Currency = require('ripple-lib').Currency;
 var Amount = require('ripple-lib').Amount;
 var Meta = require('ripple-lib').Meta;
+var addresses = require('./fixtures/addresses');
+var fixtures = require('./fixtures/orderbook');
 
 describe('OrderBook', function() {
   it('toJSON', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
+
     assert.deepEqual(book.toJSON(), {
       taker_gets: {
         currency: Currency.from_json('XRP').to_hex()
       },
       taker_pays: {
         currency: Currency.from_json('BTC').to_hex(),
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       }
     });
+
     book = new Remote().createOrderBook({
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_gets: 'BTC',
       currency_pays: 'XRP'
     });
+
     assert.deepEqual(book.toJSON(), {
       taker_gets: {
         currency: Currency.from_json('BTC').to_hex(),
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       },
       taker_pays: {
         currency: Currency.from_json('XRP').to_hex()
@@ -39,28 +44,31 @@ describe('OrderBook', function() {
   it('Check orderbook validity', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
+
     assert(book.isValid());
   });
 
   it('Automatic subscription (based on listeners)', function(done) {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
+
     book.subscribe = function() {
       done();
     };
+
     book.on('model', function(){});
   });
 
   it('Subscribe', function(done) {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
@@ -82,7 +90,7 @@ describe('OrderBook', function() {
   it('Unsubscribe', function(done) {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
@@ -99,154 +107,326 @@ describe('OrderBook', function() {
     assert.deepEqual(book.listeners(), []);
   });
 
-  it('Automatic unsubscription (based on listeners)', function(done) {
+  it('Automatic unsubscription - remove all listeners', function(done) {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
+
     book.unsubscribe = function() {
       done();
     };
+
     book.on('model', function(){});
     book.removeAllListeners('model');
   });
 
-  it('Add cached owner funds', function() {
+  it('Automatic unsubscription - once listener', function(done) {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
-    book.addCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
-    assert.strictEqual(book.getCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji'), '1');
+
+    book.unsubscribe = function() {
+      done();
+    };
+
+    book.once('model', function(){});
+    book.emit('model', {});
   });
 
-  it('Add cached owner funds - invalid account', function() {
+  it('Set owner funds', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
+
+    book._issuerTransferRate = 1000000000;
+    book.setOwnerFunds(addresses.ACCOUNT, '1');
+
+    assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), '1');
+  });
+
+  it('Set owner funds - unadjusted funds', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'XRP',
+      issuer_pays: addresses.ISSUER,
+      currency_pays: 'BTC'
+    });
+
+    book._issuerTransferRate = 1002000000;
+    book.setOwnerFunds(addresses.ACCOUNT, '1');
+
+    assert.strictEqual(book._ownerFundsUnadjusted[addresses.ACCOUNT], '1');
+  });
+
+  it('Set owner funds - invalid account', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'XRP',
+      issuer_pays: addresses.ISSUER,
+      currency_pays: 'BTC'
+    });
+
     assert.throws(function() {
-      book.addCachedFunds('0rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
+      book.setOwnerFunds('0rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
     });
   });
 
-  it('Has cached owner funds', function() {
+  it('Set owner funds - invalid amount', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'XRP',
+      issuer_pays: addresses.ISSUER,
+      currency_pays: 'BTC'
+    });
+
+    assert.throws(function() {
+      book.setOwnerFunds(addresses.ACCOUNT, null);
+    });
+  });
+
+  it('Has owner funds', function() {
     var book =  new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
-    book.addCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
-    assert(book.hasCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji'));
+
+    book._ownerFunds[addresses.ACCOUNT] = '1';
+    assert(book.hasOwnerFunds(addresses.ACCOUNT));
   });
 
-  it('Has cached owner funds - invalid account', function() {
-    var book =  new Remote().createOrderBook({
-      currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
-      currency_pays: 'BTC'
-    });
-    assert.throws(function() {
-      book.addCachedFunds('0rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
-    });
-  });
-
-  it('Remove cached owner funds', function() {
+  it('Delete owner funds', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
-    book.addCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
-    assert(book.hasCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji'));
-    book.removeCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji');
-    assert(!book.hasCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji'));
+
+    book._ownerFunds[addresses.ACCOUNT] = '1';
+    assert(book.hasOwnerFunds(addresses.ACCOUNT));
+
+    book.deleteOwnerFunds(addresses.ACCOUNT);
+    assert(!book.hasOwnerFunds(addresses.ACCOUNT));
   });
 
-  it('Remove cached owner funds', function() {
+  it('Delete owner funds', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
-    book.addCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji', '1');
-    assert(book.hasCachedFunds('rrrrrrrrrrrrrrrrrrrrBZbvji'));
+
+    book._ownerFunds[addresses.ACCOUNT] = '1';
+    assert(book.hasOwnerFunds(addresses.ACCOUNT));
+
     assert.throws(function() {
-      book.removeCachedFunds('0rrrrrrrrrrrrrrrrrrrrBZbvji');
+      book.deleteOwnerFunds('0rrrrrrrrrrrrrrrrrrrrBZbvji');
     });
   });
 
-  it('Increment offer count', function() {
+  it('Increment owner offer count', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
-    assert.strictEqual(book.incrementOfferCount('rrrrrrrrrrrrrrrrrrrrBZbvji'), 1);
-    assert.strictEqual(book.getOfferCount('rrrrrrrrrrrrrrrrrrrrBZbvji'), 1);
+
+    assert.strictEqual(book.incrementOwnerOfferCount(addresses.ACCOUNT), 1);
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 1);
   });
 
-  it('Increment offer count - invalid address', function() {
+  it('Increment owner offer count - invalid address', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
+
     assert.throws(function() {
-      book.incrementOfferCount('zrrrrrrrrrrrrrrrrrrrBZbvji');
+      book.incrementOwnerOfferCount('zrrrrrrrrrrrrrrrrrrrBZbvji');
     });
   });
 
-  it('Decrement offer count', function() {
+  it('Decrement owner offer count', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
-    book.incrementOfferCount('rrrrrrrrrrrrrrrrrrrrBZbvji');
-    assert.strictEqual(book.decrementOfferCount('rrrrrrrrrrrrrrrrrrrrBZbvji'), 0);
-    assert.strictEqual(book.getOfferCount('rrrrrrrrrrrrrrrrrrrrBZbvji'), 0);
+
+    book.incrementOwnerOfferCount(addresses.ACCOUNT);
+
+    assert.strictEqual(book.decrementOwnerOfferCount(addresses.ACCOUNT), 0);
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 0);
   });
 
-  it('Decrement offer count - invalid address', function() {
+  it('Decrement owner offer count - no more offers', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
+
+    book.incrementOwnerOfferCount(addresses.ACCOUNT);
+
+    assert.strictEqual(book.decrementOwnerOfferCount(addresses.ACCOUNT), 0);
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 0);
+    assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT, undefined));
+  });
+
+  it('Decrement owner offer count - invalid address', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'BTC',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
     assert.throws(function() {
-      book.decrementOfferCount('zrrrrrrrrrrrrrrrrrrrBZbvji');
+      book.decrementOwnerOfferCount('zrrrrrrrrrrrrrrrrrrrBZbvji');
     });
   });
 
-  it('Apply transfer rate', function() {
+  it('Subtract owner offer total', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
-    assert.strictEqual(book.applyTransferRate('1', 1002000000), '0.9980039920159681');
+
+    book._ownerOffersTotal[addresses.ACCOUNT] = Amount.from_json({
+      value: 3,
+      currency: 'BTC',
+      issuer: addresses.ISSUER
+    });
+
+    var newAmount = book.subtractOwnerOfferTotal(addresses.ACCOUNT, {
+      value: 2,
+      currency: 'BTC',
+      issuer: addresses.ISSUER
+    });
+
+    var offerTotal = Amount.from_json({
+      value: 1,
+      currency: 'BTC',
+      issuer: addresses.ISSUER
+    });
+
+    assert(newAmount.equals(offerTotal));
+  });
+
+  it('Subtract owner offer total - negative total', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'BTC',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    assert.throws(function() {
+      book.subtractOwnerOfferTotal(addresses.ACCOUNT, {
+        value: 2,
+        currency: 'BTC',
+        issuer: addresses.ISSUER
+      });
+    });
+  });
+
+  it('Get owner offer total', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'BTC',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    book._ownerOffersTotal[addresses.ACCOUNT] = Amount.from_json({
+      value: 3,
+      currency: 'BTC',
+      issuer: addresses.ISSUER
+    });
+
+    var offerTotal = Amount.from_json({
+      value: 3,
+      currency: 'BTC',
+      issuer: addresses.ISSUER
+    });
+
+    assert(offerTotal.equals(book.getOwnerOfferTotal(addresses.ACCOUNT)));
+  });
+
+  it('Get owner offer total - native', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'XRP',
+      issuer_pays: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._ownerOffersTotal[addresses.ACCOUNT] = Amount.from_json('3');
+
+    var offerTotal = Amount.from_json('3');
+
+    assert(offerTotal.equals(book.getOwnerOfferTotal(addresses.ACCOUNT)));
+  });
+
+  it('Get owner offer total - no total', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'BTC',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    var offerTotal = Amount.from_json({
+      value: 0,
+      currency: 'BTC',
+      issuer: addresses.ISSUER
+    });
+
+    assert(offerTotal.equals(book.getOwnerOfferTotal(addresses.ACCOUNT)));
+  });
+
+  it('Get owner offer total - native - no total', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'XRP',
+      issuer_pays: addresses.ISSUER,
+      currency_pays: 'BTC'
+    });
+
+    var offerTotal = Amount.from_json('0');
+
+    assert(offerTotal.equals(book.getOwnerOfferTotal(addresses.ACCOUNT)));
   });
 
   it('Apply transfer rate - cached transfer rate', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
+
     book._issuerTransferRate = 1002000000;
+
     assert.strictEqual(book.applyTransferRate('1'), '0.9980039920159681');
   });
 
+  it('Apply transfer rate - native currency', function() {
+    var book = new Remote().createOrderBook({
+      currency_gets: 'XRP',
+      issuer_pays: addresses.ISSUER,
+      currency_pays: 'BTC'
+    });
+
+    book._issuerTransferRate = 1000000000;
+
+    assert.strictEqual(book.applyTransferRate('0.9980039920159681'), '0.9980039920159681');
+  });
+
   it('Apply transfer rate - invalid balance', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
+
     assert.throws(function() {
       book.applyTransferRate('asdf');
     });
@@ -255,11 +435,12 @@ describe('OrderBook', function() {
   it('Apply transfer rate - invalid transfer rate', function() {
     var book = new Remote().createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
+
     assert.throws(function() {
-      book.applyTransferRate('1', 'asdf');
+      book.applyTransferRate('1');
     });
   });
 
@@ -267,7 +448,7 @@ describe('OrderBook', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -275,8 +456,9 @@ describe('OrderBook', function() {
       assert.deepEqual(request.message, {
         command: 'account_info',
         id: void(0),
-        account: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        account: addresses.ISSUER
       });
+
       request.emit('success', {
         account_data: {
           TransferRate: 1002000000
@@ -290,11 +472,38 @@ describe('OrderBook', function() {
     });
   });
 
+  it('Request transfer rate - not set', function() {
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'BTC',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    remote.request = function(request) {
+      assert.deepEqual(request.message, {
+        command: 'account_info',
+        id: void(0),
+        account: addresses.ISSUER
+      });
+
+      request.emit('success', {
+        account_data: {
+        }
+      });
+    };
+
+    book.requestTransferRate(function(err, rate) {
+      assert.ifError(err);
+      assert.strictEqual(rate, 1000000000);
+    });
+  });
+
   it('Request transfer rate - cached transfer rate', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -314,7 +523,7 @@ describe('OrderBook', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
@@ -325,173 +534,194 @@ describe('OrderBook', function() {
     book.requestTransferRate(function(err, rate) {
       assert.ifError(err);
       assert.strictEqual(rate, 1000000000);
+      assert.strictEqual(book._issuerTransferRate, 1000000000);
     });
   });
 
-  it('Set funded amount - iou/xrp - funded', function() {
+  it('Set offer funded amount - iou/xrp - fully funded', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'BTC',
       currency_pays: 'XRP',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+      issuer_gets: addresses.ISSUER
     });
 
+    book._issuerTransferRate = 1000000000;
+
     var offer = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: {
         value: '100',
         currency: 'BTC',
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       },
       TakerPays: '123456'
     };
 
-    book.setFundedAmount(offer, '100.1234');
+    book.setOwnerFunds(addresses.ACCOUNT, '100.1234');
+    book.setOfferFundedAmount(offer);
 
     var expected = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: offer.TakerGets,
       TakerPays: offer.TakerPays,
       is_fully_funded: true,
       taker_gets_funded: '100',
-      taker_pays_funded: '123456'
+      taker_pays_funded: '123456',
+      owner_funds: '100.1234'
     };
 
     assert.deepEqual(offer, expected);
   });
 
-  it('Set funded amount - iou/xrp - unfunded', function() {
+  it('Set offer funded amount - iou/xrp - unfunded', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'BTC',
       currency_pays: 'XRP',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+      issuer_gets: addresses.ISSUER
     });
 
+    book._issuerTransferRate = 1000000000;
+
     var offer = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: {
         value: '100',
         currency: 'BTC',
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       },
       TakerPays: '123456'
     };
 
-    book.setFundedAmount(offer, '99');
+    book.setOwnerFunds(addresses.ACCOUNT, '99');
+    book.setOfferFundedAmount(offer);
 
     var expected = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: offer.TakerGets,
       TakerPays: offer.TakerPays,
       is_fully_funded: false,
       taker_gets_funded: '99',
-      taker_pays_funded: '122221'
+      taker_pays_funded: '122221',
+      owner_funds: '99'
     };
 
     assert.deepEqual(offer, expected);
   });
 
-  it('Set funded amount - xrp/iou - funded', function() {
+  it('Set offer funded amount - xrp/iou - funded', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
+    book._issuerTransferRate = 1000000000;
+
     var offer = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: '100',
       TakerPays: {
         value: '123.456',
         currency: 'BTC',
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       }
     };
 
-    book.setFundedAmount(offer, '100.1');
+    book.setOwnerFunds(addresses.ACCOUNT, '100.1');
+    book.setOfferFundedAmount(offer);
 
     var expected = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: offer.TakerGets,
       TakerPays: offer.TakerPays,
       is_fully_funded: true,
       taker_gets_funded: '100',
-      taker_pays_funded: '123.456'
+      taker_pays_funded: '123.456',
+      owner_funds: '100.1'
     };
 
     assert.deepEqual(offer, expected);
   });
 
-  it('Set funded amount - xrp/iou - unfunded', function() {
+  it('Set offer funded amount - xrp/iou - unfunded', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
+    book._issuerTransferRate = 1000000000;
+
     var offer = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: '100',
       TakerPays: {
         value: '123.456',
         currency: 'BTC',
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       }
     };
 
-    book.setFundedAmount(offer, '99');
+    book.setOwnerFunds(addresses.ACCOUNT, '99');
+    book.setOfferFundedAmount(offer);
 
     var expected = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: offer.TakerGets,
       TakerPays: offer.TakerPays,
       is_fully_funded: false,
       taker_gets_funded: '99',
-      taker_pays_funded: '122.22144'
+      taker_pays_funded: '122.22144',
+      owner_funds: '99'
     };
 
     assert.deepEqual(offer, expected);
   });
 
-  it('Set funded amount - zero funds', function() {
+  it('Set offer funded amount - zero funds', function() {
     var remote = new Remote();
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
+    book._issuerTransferRate = 1000000000;
+
     var offer = {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: {
         value: '100',
         currency: 'BTC',
-        issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
+        issuer: addresses.ISSUER
       },
       TakerPays: '123456'
     };
 
-    book.setFundedAmount(offer, '0');
+    book.setOwnerFunds(addresses.ACCOUNT, '0');
+    book.setOfferFundedAmount(offer);
 
     assert.deepEqual(offer, {
-      Account: 'rrrrrrrrrrrrrrrrrrrrrhoLvTp',
+      Account: addresses.ACCOUNT,
       TakerGets: offer.TakerGets,
       TakerPays: offer.TakerPays,
       is_fully_funded: false,
       taker_gets_funded: '0',
-      taker_pays_funded: '0'
+      taker_pays_funded: '0',
+      owner_funds: '0'
     });
   });
 
-  it('Check is balance change', function() {
+  it('Check is balance change node', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'USD',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -501,13 +731,13 @@ describe('OrderBook', function() {
           FinalFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '-1'
             },
             Flags: 131072,
             HighLimit: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '100'
             },
             HighNode: '0000000000000000',
@@ -523,7 +753,7 @@ describe('OrderBook', function() {
           PreviousFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '0'
             }
           },
@@ -533,15 +763,15 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert(book.isBalanceChange(meta.getNodes()[0]));
+    assert(book.isBalanceChangeNode(meta.getNodes()[0]));
   });
 
-  it('Check is balance change - not balance change', function() {
+  it('Check is balance change node - not balance change', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
@@ -551,7 +781,7 @@ describe('OrderBook', function() {
           FinalFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '-1'
             },
             Flags: 131072,
@@ -576,15 +806,15 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert(!book.isBalanceChange(meta.getNodes()[0]));
+    assert(!book.isBalanceChangeNode(meta.getNodes()[0]));
   });
 
-  it('Check is balance change - different currency', function() {
+  it('Check is balance change node - different currency', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -594,13 +824,13 @@ describe('OrderBook', function() {
           FinalFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '-1'
             },
             Flags: 131072,
             HighLimit: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '100'
             },
             HighNode: '0000000000000000',
@@ -616,7 +846,7 @@ describe('OrderBook', function() {
           PreviousFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '0'
             }
           },
@@ -626,15 +856,15 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert(!book.isBalanceChange(meta.getNodes()[0]));
+    assert(!book.isBalanceChangeNode(meta.getNodes()[0]));
   });
 
-  it('Check is balance change - different issuer', function() {
+  it('Check is balance change node - different issuer', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'USD',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -644,7 +874,7 @@ describe('OrderBook', function() {
           FinalFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '-1'
             },
             Flags: 131072,
@@ -666,7 +896,7 @@ describe('OrderBook', function() {
           PreviousFields: {
             Balance: {
               currency: 'USD',
-              issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+              issuer: addresses.ISSUER,
               value: '0'
             }
           },
@@ -676,15 +906,15 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert(!book.isBalanceChange(meta.getNodes()[0]));
+    assert(!book.isBalanceChangeNode(meta.getNodes()[0]));
   });
 
-  it('Check is balance change - native currency', function() {
+  it('Check is balance change node - native currency', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
@@ -711,15 +941,15 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert(book.isBalanceChange(meta.getNodes()[0]));
+    assert(book.isBalanceChangeNode(meta.getNodes()[0]));
   });
 
-  it('Check is balance change - native currency - not balance change', function() {
+  it('Check is balance change node - native currency - not balance change', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'BTC'
     });
 
@@ -741,15 +971,15 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert(!book.isBalanceChange(meta.getNodes()[0]));
+    assert(!book.isBalanceChangeNode(meta.getNodes()[0]));
   });
 
-  it('Get balance change', function() {
+  it('Parse account balance from node', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'USD',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -760,13 +990,13 @@ describe('OrderBook', function() {
             FinalFields: {
               Balance: {
                 currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+                issuer: addresses.ISSUER,
                 value: '10'
               },
               Flags: 131072,
               HighLimit: {
                 currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+                issuer: addresses.ISSUER,
                 value: '100'
               },
               HighNode: '0000000000000000',
@@ -782,7 +1012,7 @@ describe('OrderBook', function() {
             PreviousFields: {
               Balance: {
                 currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+                issuer: addresses.ISSUER,
                 value: '0'
               }
             },
@@ -795,7 +1025,7 @@ describe('OrderBook', function() {
             FinalFields: {
               Balance: {
                 currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+                issuer: addresses.ISSUER,
                 value: '-10'
               },
               Flags: 131072,
@@ -807,7 +1037,7 @@ describe('OrderBook', function() {
               HighNode: '0000000000000000',
               LowLimit: {
                 currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+                issuer: addresses.ISSUER,
                 value: '0'
               },
               LowNode: '0000000000000000'
@@ -817,7 +1047,7 @@ describe('OrderBook', function() {
             PreviousFields: {
               Balance: {
                 currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+                issuer: addresses.ISSUER,
                 value: '0'
               }
             },
@@ -828,25 +1058,23 @@ describe('OrderBook', function() {
       ]
     });
 
-    assert.deepEqual(book.getBalanceChange(meta.getNodes()[0]), {
+    assert.deepEqual(book.parseAccountBalanceFromNode(meta.getNodes()[0]), {
       account: 'r3PDtZSa5LiYp1Ysn1vMuMzB59RzV3W9QH',
-      balance: '10',
-      isValid: true
+      balance: '10'
     });
 
-    assert.deepEqual(book.getBalanceChange(meta.getNodes()[1]), {
+    assert.deepEqual(book.parseAccountBalanceFromNode(meta.getNodes()[1]), {
       account: 'r3PDtZSa5LiYp1Ysn1vMuMzB59RzV3W9QH',
-      balance: '10',
-      isValid: true
+      balance: '10'
     });
   });
 
-  it('Get balance change - native currency', function() {
+  it('Parse account balance from node - native currency', function() {
     var remote = new Remote();
 
     var book = remote.createOrderBook({
       currency_gets: 'USD',
-      issuer_gets: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
@@ -873,361 +1101,175 @@ describe('OrderBook', function() {
       }]
     });
 
-    assert.deepEqual(book.getBalanceChange(meta.getNodes()[0]), {
+    assert.deepEqual(book.parseAccountBalanceFromNode(meta.getNodes()[0]), {
       account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-      balance: '9999999990',
-      isValid: true
+      balance: '9999999990'
     });
   });
 
   it('Update funded amounts', function(done) {
+    var receivedChangedEvents = 0;
+    var receivedFundsChangedEvents = 0;
+
     var remote = new Remote();
 
+    var message = fixtures.transactionWithRippleState();
+
     var book = remote.createOrderBook({
       currency_gets: 'USD',
-      issuer_gets: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
-    var message = {
-      mmeta: new Meta({
-        AffectedNodes: [{
-          ModifiedNode: {
-            FinalFields: {
-              Balance: {
-                currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
-                value: '10'
-              },
-              Flags: 131072,
-              HighLimit: {
-                currency: 'USD',
-                issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-                value: '100'
-              },
-              HighNode: '0000000000000000',
-              LowLimit: {
-                currency: 'USD',
-                issuer: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-                value: '0'
-              },
-              LowNode: '0000000000000000'
-            },
-            LedgerEntryType: 'RippleState',
-            LedgerIndex: 'EA4BF03B4700123CDFFB6EB09DC1D6E28D5CEB7F680FB00FC24BC1C3BB2DB959',
-            PreviousFields: {
-              Balance: {
-                currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
-                value: '0'
-              }
-            },
-            PreviousTxnID: '53354D84BAE8FDFC3F4DA879D984D24B929E7FEB9100D2AD9EFCD2E126BCCDC8',
-            PreviousTxnLgrSeq: 343570
-          }
-        }]
-      })
-    };
-
     book._issuerTransferRate = 1000000000;
     book._synchronized = true;
 
-    book._offers = [
-      {
-        Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F15E821839FB',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '0000000000001897',
-        PreviousTxnID: '11BA57676711A42C2FC2191EAEE98023B04627DFA84926B0C8E9D61A9CAF13AD',
-        PreviousTxnLgrSeq: 8265601,
-        Sequence: 531927,
-        TakerGets: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '19.84580331'
-        },
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: '3878342440',
-        index: '06AFB03237286C1566CD649CFD5388C2C1F5BEFC5C3302A1962682803A9946FA',
-        owner_funds: '318.3643710638508',
-        quality: '195423807.2109563'
-      },
-      {
-        Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F4C3362FE1D0',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '00000000000063CC',
-        PreviousTxnID: 'CD77500EF28984BFC123E8A257C10E44FF486EA8FC43E1356C42BD6DB853A602',
-        PreviousTxnLgrSeq: 8265523,
-        Sequence: 1139002,
-        TakerGets: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '4.9656112525'
-        },
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: '972251352',
-        index: 'D3338DA77BA23122FB5647B74B53636AB54BE246D4B21707C9D6887DEB334252',
-        owner_funds: '235.0194163432668',
-        quality: '195796912.5171664'
-      },
-      {
-        Account: 'r8cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F4C3362FE1D0',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '00000000000063CC',
-        PreviousTxnID: 'CD77500EF28984BFC123E8A257C10E44FF486EA8FC43E1356C42BD6DB853A602',
-        PreviousTxnLgrSeq: 8265523,
-        Sequence: 1139002,
-        TakerGets: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '4.9656112525'
-        },
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: '972251352',
-        index: 'D3338DA77BA23122FB5647B74B53636AB54BE246D4B21707C9D6887DEB334252',
-        owner_funds: '235.0194163432668',
-        quality: '195796912.5171664'
-      },
-    ];
+    book._offers = fixtures.FIAT_OFFERS;
 
-  var receivedChangedEvents = 0;
-  var receivedFundsChangedEvents = 0;
+    book.on('offer_changed', function(offer) {
+      receivedChangedEvents += 1;
+    });
 
-  book.on('offer_changed', function(offer) {
-    receivedChangedEvents += 1;
+    book.on('offer_funds_changed', function(offer, previousFunds, newFunds) {
+      assert.strictEqual(previousFunds, '100');
+      assert.strictEqual(newFunds, offer.taker_gets_funded);
+      assert.notStrictEqual(previousFunds, newFunds);
+      switch (++receivedFundsChangedEvents) {
+        case 1:
+          assert(!offer.is_fully_funded);
+          break;
+        case 2:
+          assert(offer.is_fully_funded);
+          break;
+      }
+    });
+
+    book._ownerFunds[addresses.ACCOUNT] = '100';
+    book.updateFundedAmounts(message);
+
+    setImmediate(function() {
+      assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), fixtures.FIAT_BALANCE);
+      assert.strictEqual(receivedChangedEvents, 2);
+      assert.strictEqual(receivedFundsChangedEvents, 2);
+      done();
+    });
   });
 
-  book.on('offer_funds_changed', function(offer, previousFunds, newFunds) {
-    assert.strictEqual(previousFunds, '100');
-    assert.strictEqual(newFunds, offer.taker_gets_funded);
-    assert.notStrictEqual(previousFunds, newFunds);
-    switch (++receivedFundsChangedEvents) {
-      case 1:
-        assert(!offer.is_fully_funded);
-        break;
-      case 2:
-        assert(offer.is_fully_funded);
-        break;
-    }
+  it('Update funded amounts - owner_funds', function(done) {
+    var remote = new Remote();
+
+    var message = fixtures.transactionWithRippleState();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._issuerTransferRate = 1002000000;
+    book._synchronized = true;
+
+    book._offers = fixtures.FIAT_OFFERS;
+
+    book._ownerFunds[addresses.ACCOUNT] = '100';
+    book.updateFundedAmounts(message);
+
+    setImmediate(function() {
+      assert.strictEqual(book._offers[0].owner_funds, fixtures.FIAT_BALANCE);
+      assert.strictEqual(book._offers[1].owner_funds, fixtures.FIAT_BALANCE);
+
+      done();
+    });
   });
 
-  book.addCachedFunds('r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59', '100');
-  book.updateFundedAmounts(message);
+  it('Update funded amounts - issuer transfer rate set', function(done) {
+    var remote = new Remote();
 
-  setImmediate(function() {
-    book.getCachedFunds('r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59', '10');
-    assert.strictEqual(receivedChangedEvents, 2);
-    assert.strictEqual(receivedFundsChangedEvents, 2);
-    done();
-  });
+    var message = fixtures.transactionWithRippleState();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._issuerTransferRate = 1002000000;
+    book._synchronized = true;
+
+    book._ownerFunds[addresses.ACCOUNT] = '100';
+    book._offers = fixtures.FIAT_OFFERS;
+
+    book.updateFundedAmounts(message);
+
+    setImmediate(function() {
+      assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), '9.980039920159681');
+
+      done();
+    });
   });
 
   it('Update funded amounts - native currency', function(done) {
+    var receivedChangedEvents = 0;
+    var receivedFundsChangedEvents = 0;
+
     var remote = new Remote();
+    
+    var message = fixtures.transactionWithAccountRoot();
 
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'USD'
     });
 
-    var message = {
-      mmeta: new Meta({
-        AffectedNodes: [{
-          ModifiedNode: {
-            FinalFields: {
-              Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-              Balance: '25',
-              Flags: 0,
-              OwnerCount: 1,
-              Sequence: 2
-            },
-            LedgerEntryType: 'AccountRoot',
-            LedgerIndex: '4F83A2CF7E70F77F79A307E6A472BFC2585B806A70833CCD1C26105BAE0D6E05',
-            PreviousFields: {
-              Balance: '100',
-              OwnerCount: 0,
-              Sequence: 1
-            },
-            PreviousTxnID: 'B24159F8552C355D35E43623F0E5AD965ADBF034D482421529E2703904E1EC09',
-            PreviousTxnLgrSeq: 16154
-          }
-        }]
-      })
-    };
-
     book._synchronized = true;
+    book._offers = fixtures.NATIVE_OFFERS;
 
-    book._offers = [
-      {
-        Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: 'DFA3B6DDAB58C7E8E5D944E736DA4B7046C30E4F460FD9DE4C124AF94ED1781B',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '00000000000063CA',
-        PreviousTxnID: '51C64E0B300E9C0E877BA3E79B4ED1DBD5FDDCE58FA1A8FDA5F8DDF139787A24',
-        PreviousTxnLgrSeq: 8265275,
-        Sequence: 1138918,
-        TakerGets: '50',
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '5'
-        },
-        index: 'DC003E09AD1306FBBD1957C955EE668E429CC85B0EC0EC17297F6676E6108DE7',
-        owner_funds: '162110617177',
-        quality: '0.000000005148984210454555'
-      },
-      {
-        Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: 'DFA3B6DDAB58C7E8E5D944E736DA4B7046C30E4F460FD9DE4C124B054BAD1D79',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '0000000000001896',
-        PreviousTxnID: '9B21C7A4B66DC1CD5FC9D85C821C4CAA8F80E437582BAD11E88A1E9E6C7AA59C',
-        PreviousTxnLgrSeq: 8265118,
-        Sequence: 531856,
-        TakerGets: '10',
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '20'
-        },
-        index: '7AC0458676A54E99FAA5ED0A56CD0CB814D3DEFE1C7874F0BB39875D60668E41',
-        owner_funds: '430527438338',
-        quality: '0.000000005149035697347961'
-      },
-      {
-        Account: 'r8cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: '4627DFFCFF8B5A265EDBD8AE8C14A52325DBFEDAF4F5C32E5D06F4C3362FE1D0',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '00000000000063CC',
-        PreviousTxnID: 'CD77500EF28984BFC123E8A257C10E44FF486EA8FC43E1356C42BD6DB853A602',
-        PreviousTxnLgrSeq: 8265523,
-        Sequence: 1139002,
-        TakerGets: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '4.9656112525'
-        },
-        TakerPays: '972251352',
-        index: 'D3338DA77BA23122FB5647B74B53636AB54BE246D4B21707C9D6887DEB334252',
-        owner_funds: '235.0194163432668',
-        quality: '195796912.5171664'
-      },
-    ];
+    book.on('offer_changed', function(offer) {
+      receivedChangedEvents += 1;
+    });
 
-  var receivedChangedEvents = 0;
-  var receivedFundsChangedEvents = 0;
+    book.on('offer_funds_changed', function(offer, previousFunds, newFunds) {
+      assert.strictEqual(previousFunds, fixtures.NATIVE_BALANCE_PREVIOUS);
+      assert.strictEqual(newFunds, offer.taker_gets_funded);
+      assert.notStrictEqual(previousFunds, newFunds);
+      switch (++receivedFundsChangedEvents) {
+        case 1:
+          assert(!offer.is_fully_funded);
+          break;
+        case 2:
+          assert(offer.is_fully_funded);
+          break;
+      }
+    });
 
-  book.on('offer_changed', function(offer) {
-    receivedChangedEvents += 1;
-  });
+    book._ownerFunds[addresses.ACCOUNT] = fixtures.NATIVE_BALANCE_PREVIOUS;
+    book.updateFundedAmounts(message);
 
-  book.on('offer_funds_changed', function(offer, previousFunds, newFunds) {
-    assert.strictEqual(previousFunds, '100');
-    assert.strictEqual(newFunds, offer.taker_gets_funded);
-    assert.notStrictEqual(previousFunds, newFunds);
-    switch (++receivedFundsChangedEvents) {
-      case 1:
-        assert(!offer.is_fully_funded);
-        break;
-      case 2:
-        assert(offer.is_fully_funded);
-        break;
-    }
-  });
-
-  book.addCachedFunds('r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59', '100');
-  book.updateFundedAmounts(message);
-
-  setImmediate(function() {
-    book.getCachedFunds('r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59', '25');
-    assert.strictEqual(receivedChangedEvents, 2);
-    assert.strictEqual(receivedFundsChangedEvents, 2);
-    done();
-  });
+    setImmediate(function() {
+      book.getOwnerFunds(addresses.ACCOUNT, fixtures.NATIVE_BALANCE);
+      assert.strictEqual(receivedChangedEvents, 2);
+      assert.strictEqual(receivedFundsChangedEvents, 2);
+      done();
+    });
   });
 
   it('Update funded amounts - no affected account', function(done) {
     var remote = new Remote();
+    
+    var message = fixtures.transactionWithAccountRoot({
+      account: addresses.ACCOUNT
+    });
 
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'USD'
     });
 
-    var message = {
-      mmeta: new Meta({
-        AffectedNodes: [{
-          ModifiedNode: {
-            FinalFields: {
-              Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-              Balance: '25',
-              Flags: 0,
-              OwnerCount: 1,
-              Sequence: 2
-            },
-            LedgerEntryType: 'AccountRoot',
-            LedgerIndex: '4F83A2CF7E70F77F79A307E6A472BFC2585B806A70833CCD1C26105BAE0D6E05',
-            PreviousFields: {
-              Balance: '100',
-              OwnerCount: 0,
-              Sequence: 1
-            },
-            PreviousTxnID: 'B24159F8552C355D35E43623F0E5AD965ADBF034D482421529E2703904E1EC09',
-            PreviousTxnLgrSeq: 16154
-          }
-        }]
-      })
-    };
-
     book._synchronized = true;
 
-    book._offers = [
-      {
-        Account: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
-        BookDirectory: 'DFA3B6DDAB58C7E8E5D944E736DA4B7046C30E4F460FD9DE4C124AF94ED1781B',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '00000000000063CA',
-        PreviousTxnID: '51C64E0B300E9C0E877BA3E79B4ED1DBD5FDDCE58FA1A8FDA5F8DDF139787A24',
-        PreviousTxnLgrSeq: 8265275,
-        Sequence: 1138918,
-        TakerGets: '50',
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '5'
-        },
-        index: 'DC003E09AD1306FBBD1957C955EE668E429CC85B0EC0EC17297F6676E6108DE7',
-        owner_funds: '162110617177',
-        quality: '0.000000005148984210454555'
-      }
-    ];
+    book._offers = fixtures.NATIVE_OFFERS;
 
     book._offers.__defineGetter__(0, function() {
       assert(false, 'Iteration of offers for unaffected account');
@@ -1251,56 +1293,15 @@ describe('OrderBook', function() {
 
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
-      issuer_pays: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+      issuer_pays: addresses.ISSUER,
       currency_pays: 'USD'
     });
 
-    var message = {
-      mmeta: new Meta({
-        AffectedNodes: [{
-          ModifiedNode: {
-            FinalFields: {
-              Account: 'r3kmLJN5D28dHuH8vZNUZpMC43pEHpaocV',
-              Balance: '78991384535796',
-              Flags: 0,
-              OwnerCount: 3,
-              Sequence: 188
-            },
-            LedgerEntryType: 'AccountRoot',
-            LedgerIndex: 'B33FDD5CF3445E1A7F2BE9B06336BEBD73A5E3EE885D3EF93F7E3E2992E46F1A',
-            PreviousTxnID: 'E9E1988A0F061679E5D14DE77DB0163CE0BBDC00F29E396FFD1DA0366E7D8904',
-            PreviousTxnLgrSeq: 195455
-          }
-        }]
-      })
-    };
+    var message = fixtures.transactionWithInvalidAccountRoot();
 
     book._synchronized = true;
 
-    book._offers = [
-      {
-        Account: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-        BookDirectory: 'DFA3B6DDAB58C7E8E5D944E736DA4B7046C30E4F460FD9DE4C124AF94ED1781B',
-        BookNode: '0000000000000000',
-        Flags: 0,
-        LedgerEntryType: 'Offer',
-        OwnerNode: '00000000000063CA',
-        PreviousTxnID: '51C64E0B300E9C0E877BA3E79B4ED1DBD5FDDCE58FA1A8FDA5F8DDF139787A24',
-        PreviousTxnLgrSeq: 8265275,
-        Sequence: 1138918,
-        TakerGets: '50',
-        taker_gets_funded: '100',
-        is_fully_funded: true,
-        TakerPays: {
-          currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          value: '5'
-        },
-        index: 'DC003E09AD1306FBBD1957C955EE668E429CC85B0EC0EC17297F6676E6108DE7',
-        owner_funds: '162110617177',
-        quality: '0.000000005148984210454555'
-      }
-    ];
+    book._offers = fixtures.NATIVE_OFFERS;
 
     book.on('offer_changed', function() {
       assert(false, 'offer_changed event emitted');
@@ -1310,13 +1311,13 @@ describe('OrderBook', function() {
       assert(false, 'offer_funds_changed event emitted');
     });
 
-    assert.strictEqual(typeof book.getBalanceChange, 'function');
+    assert.strictEqual(typeof book.parseAccountBalanceFromNode, 'function');
 
-    book.getBalanceChange = function() {
+    book.parseAccountBalanceFromNode = function() {
       assert(false, 'getBalanceChange should not be called');
     };
 
-    book.addCachedFunds('r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59', '100');
+    book._ownerFunds[addresses.ACCOUNT] = '100';
     book.updateFundedAmounts(message);
 
     setImmediate(done);
@@ -1327,191 +1328,599 @@ describe('OrderBook', function() {
 
     var book = remote.createOrderBook({
       currency_gets: 'USD',
-      issuer_gets: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'XRP'
     });
 
-    var message = {
-      mmeta: new Meta({
-        AffectedNodes: [{
-          ModifiedNode: {
-            FinalFields: {
-              Balance: {
-                currency: 'USD',
-                issuer: 'rrrrrrrrrrrrrrrrrrrrBZbvji',
-                value: '10'
-              },
-              Flags: 131072,
-              HighLimit: {
-                currency: 'USD',
-                issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-                value: '100'
-              },
-              HighNode: '0000000000000000',
-              LowLimit: {
-                currency: 'USD',
-                issuer: 'r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59',
-                value: '0'
-              },
-              LowNode: '0000000000000000'
-            },
-            LedgerEntryType: 'RippleState',
-            LedgerIndex: 'EA4BF03B4700123CDFFB6EB09DC1D6E28D5CEB7F680FB00FC24BC1C3BB2DB959',
-            PreviousTxnID: '53354D84BAE8FDFC3F4DA879D984D24B929E7FEB9100D2AD9EFCD2E126BCCDC8',
-            PreviousTxnLgrSeq: 343570
-          }
-        }]
-      })
-    };
+    var message = fixtures.transactionWithRippleState();
 
     remote.request = function(request) {
       assert.deepEqual(request.message, {
         command: 'account_info',
         id: undefined,
-        account: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
+        account: addresses.ISSUER
       });
 
-      request.emit('success', {
-        account_data: {
-          Account: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-          Balance: '6156166959471',
-          Domain: '6269747374616D702E6E6574',
-          EmailHash: '5B33B93C7FFE384D53450FC666BB11FB',
-          Flags: 131072,
-          LedgerEntryType: 'AccountRoot',
-          OwnerCount: 0,
-          PreviousTxnID: '6A7D0AB36CBA6884FDC398254BC67DE7E0B4887E9B0252568391102FBB854C09',
-          PreviousTxnLgrSeq: 8344426,
-          Sequence: 561,
-          TransferRate: 1002000000,
-          index: 'B7D526FDDF9E3B3F95C3DC97C353065B0482302500BBB8051A5C090B596C6133',
-          urlgravatar: 'http:www.gravatar.com/avatar/5b33b93c7ffe384d53450fc666bb11fb'
-        }
-      });
+      request.emit('success', fixtures.accountInfoResponse());
 
-      assert.strictEqual(book._issuerTransferRate, 1002000000);
+      assert.strictEqual(book._issuerTransferRate, fixtures.TRANSFER_RATE);
       done();
     };
 
-    book.addCachedFunds('r9cZA1mLK5R5Am25ArfXFmqgNwjZgnfk59', '100');
+    book._ownerFunds[addresses.ACCOUNT] = '100';
     book.updateFundedAmounts(message);
   });
 
+  it('Set offers - issuer transfer rate set', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._issuerTransferRate = 1002000000;
+
+    var offers = fixtures.BOOK_OFFERS_RESPONSE.offers;
+
+    book.setOffers(offers);
+
+    assert.strictEqual(book._offers.length, 5);
+
+    var accountOfferTotal = Amount.from_json({
+      value: 275.85192574,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    var otherAccountOfferTotal = Amount.from_json({
+      value: 24.060765960393,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    var thirdAccountOfferTotal = Amount.from_json({
+      value: 712.60995,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    var fourthAccountOfferTotal = Amount.from_json({
+      value: 288.08,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    assert(book.getOwnerOfferTotal(addresses.ACCOUNT).equals(accountOfferTotal));
+    assert(book.getOwnerOfferTotal(addresses.OTHER_ACCOUNT).equals(otherAccountOfferTotal));
+    assert(book.getOwnerOfferTotal(addresses.THIRD_ACCOUNT).equals(thirdAccountOfferTotal));
+    assert(book.getOwnerOfferTotal(addresses.FOURTH_ACCOUNT).equals(fourthAccountOfferTotal));
+
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 2);
+    assert.strictEqual(book.getOwnerOfferCount(addresses.OTHER_ACCOUNT), 1);
+    assert.strictEqual(book.getOwnerOfferCount(addresses.THIRD_ACCOUNT), 1);
+    assert.strictEqual(book.getOwnerOfferCount(addresses.FOURTH_ACCOUNT), 1);
+
+    assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), '2006.015671538605');
+    assert.strictEqual(book.getOwnerFunds(addresses.OTHER_ACCOUNT), '24.01284027983332');
+    assert.strictEqual(book.getOwnerFunds(addresses.THIRD_ACCOUNT), '9053.294314019701');
+    assert.strictEqual(book.getOwnerFunds(addresses.FOURTH_ACCOUNT), '7229.594289344439');
+  });
+
+  it('Notify - created node', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._issuerTransferRate = 1002000000;
+    book._subscribed = true;
+
+    var message = fixtures.transactionWithCreatedOffer();
+
+    book.notify(message);
+
+    var accountOfferTotal = Amount.from_json({
+      value: 1.9951,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    assert.strictEqual(book._offers.length, 1);
+    assert(book.getOwnerOfferTotal(addresses.ACCOUNT).equals(accountOfferTotal));
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 1);
+    assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), '2006.015671538605');
+  });
+
+  it('Notify - created nodes - correct sorting', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._issuerTransferRate = 1002000000;
+    book._subscribed = true;
+
+    var offer = fixtures.transactionWithCreatedOffer();
+
+    var lowQualityOffer = fixtures.transactionWithCreatedOffer({
+      account: addresses.OTHER_ACCOUNT,
+      amount: '1.5'
+    });
+
+    var highQualityOffer = fixtures.transactionWithCreatedOffer({
+      account: addresses.THIRD_ACCOUNT,
+      amount: '3.83'
+    });
+
+    book.notify(offer);
+    book.notify(lowQualityOffer);
+    book.notify(highQualityOffer);
+
+    assert.strictEqual(book._offers.length, 3);
+    assert.strictEqual(book._offers[0].Account, addresses.THIRD_ACCOUNT);
+    assert.strictEqual(book._offers[1].Account, addresses.ACCOUNT);
+    assert.strictEqual(book._offers[2].Account, addresses.OTHER_ACCOUNT);
+  });
+
+  it('Notify - created nodes - events', function() {
+    var numTransactionEvents = 0;
+    var numModelEvents = 0;
+    var numOfferAddedEvents = 0;
+
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('transaction', function() {
+      numTransactionEvents += 1;
+    });
+
+    book.on('model', function() {
+      numModelEvents += 1;
+    });
+
+    book.on('offer_added', function() {
+      numOfferAddedEvents += 1;
+    });
+
+    book._issuerTransferRate = 1002000000;
+    book._subscribed = true;
+
+    var offer = fixtures.transactionWithCreatedOffer();
+    var offer2 = fixtures.transactionWithCreatedOffer();
+    var offer3 = fixtures.transactionWithCreatedOffer();
+
+    book.notify(offer);
+    book.notify(offer2);
+    book.notify(offer3);
+
+    assert.strictEqual(numTransactionEvents, 3);
+    assert.strictEqual(numModelEvents, 3);
+    assert.strictEqual(numOfferAddedEvents, 3);
+  });
+
+  it('Notify - deleted node', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithDeletedOffer();
+
+    book.notify(message);
+
+    var accountOfferTotal = Amount.from_json({
+      value: 4.9656112525,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    assert.strictEqual(book._offers.length, 2);
+    assert(book.getOwnerOfferTotal(addresses.ACCOUNT).equals(accountOfferTotal));
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 1);
+  });
+
+  it('Notify - deleted node - last offer', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS.slice(0, 1));
+
+    var message = fixtures.transactionWithDeletedOffer();
+
+    book.notify(message);
+
+    assert.strictEqual(book._offers.length, 0);
+    assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), undefined);
+  });
+
+  it('Notify - deleted node - events', function() {
+    var numTransactionEvents = 0;
+    var numModelEvents = 0;
+    var numTradeEvents = 0;
+    var numOfferRemovedEvents = 0;
+
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('transaction', function() {
+      numTransactionEvents += 1;
+    });
+
+    book.on('model', function() {
+      numModelEvents += 1;
+    });
+
+    book.on('trade', function() {
+      numTradeEvents += 1;
+    });
+
+    book.on('offer_removed', function() {
+      numOfferRemovedEvents += 1;
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithDeletedOffer();
+
+    book.notify(message);
+
+    assert.strictEqual(numTransactionEvents, 1);
+    assert.strictEqual(numModelEvents, 1);
+    assert.strictEqual(numTradeEvents, 1);
+    assert.strictEqual(numOfferRemovedEvents, 1);
+  });
+
+  it('Notify - deleted node - trade', function(done) {
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('trade', function(tradeGets, tradePays) {
+      var expectedTradePays = Amount.from_json(fixtures.TAKER_PAYS);
+      var expectedTradeGets = Amount.from_json({
+        value: fixtures.TAKER_GETS,
+        currency: 'USD',
+        issuer: addresses.ISSUER
+      });
+
+      assert(tradePays.equals(expectedTradePays));
+      assert(tradeGets.equals(expectedTradeGets));
+
+      done();
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithDeletedOffer();
+
+    book.notify(message);
+  });
+
+  it('Notify - deleted node - offer cancel', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithDeletedOffer({
+      transaction_type: 'OfferCancel'
+    });
+
+    book.notify(message);
+
+    var accountOfferTotal = Amount.from_json({
+      value: 4.9656112525,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    assert.strictEqual(book._offers.length, 2);
+    assert(book.getOwnerOfferTotal(addresses.ACCOUNT).equals(accountOfferTotal));
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 1);
+  });
+
+  it('Notify - deleted node - offer cancel - last offer', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS.slice(0, 1));
+
+    var message = fixtures.transactionWithDeletedOffer({
+      transaction_type: 'OfferCancel'
+    });
+
+    book.notify(message);
+
+    assert.strictEqual(book._offers.length, 0);
+    assert.strictEqual(book.getOwnerFunds(addresses.ACCOUNT), undefined);
+  });
+
+  it('Notify - modified node', function() {
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+    var remote = new Remote();
+
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithModifiedOffer();
+
+    book.notify(message);
+
+    var accountOfferTotal = Amount.from_json({
+      value: 23.8114145625,
+      currency: 'USD',
+      issuer: addresses.ISSUER
+    });
+
+    assert.strictEqual(book._offers.length, 3);
+    assert(book.getOwnerOfferTotal(addresses.ACCOUNT).equals(accountOfferTotal));
+    assert.strictEqual(book.getOwnerOfferCount(addresses.ACCOUNT), 2);
+  });
+
+  it('Notify - modified node - events', function() {
+    var numTransactionEvents = 0;
+    var numModelEvents = 0;
+    var numTradeEvents = 0;
+    var numOfferChangedEvents = 0;
+
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('transaction', function() {
+      numTransactionEvents += 1;
+    });
+
+    book.on('model', function() {
+      numModelEvents += 1;
+    });
+
+    book.on('trade', function() {
+      numTradeEvents += 1;
+    });
+
+    book.on('offer_changed', function() {
+      numOfferChangedEvents += 1;
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithModifiedOffer();
+
+    book.notify(message);
+
+    assert.strictEqual(numTransactionEvents, 1);
+    assert.strictEqual(numModelEvents, 1);
+    assert.strictEqual(numTradeEvents, 1);
+    assert.strictEqual(numOfferChangedEvents, 1);
+  });
+
+  it('Notify - modified node - trade', function(done) {
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('trade', function(tradePays, tradeGets) {
+      var expectedTradePays = Amount.from_json('800000000');
+      var expectedTradeGets = Amount.from_json({
+        value: 1,
+        currency: 'USD',
+        issuer: addresses.ISSUER
+      });
+
+      assert(tradePays.equals(expectedTradePays));
+      assert(tradeGets.equals(expectedTradeGets));
+
+      done();
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithModifiedOffer();
+
+    book.notify(message);
+  });
+
+  it('Notify - modified nodes - trade', function(done) {
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('trade', function(tradePays, tradeGets) {
+      var expectedTradePays = Amount.from_json('870000000');
+      var expectedTradeGets = Amount.from_json({
+        value: 2,
+        currency: 'USD',
+        issuer: addresses.ISSUER
+      });
+
+      assert(tradePays.equals(expectedTradePays));
+      assert(tradeGets.equals(expectedTradeGets));
+
+      done();
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithModifiedOffers();
+
+    book.notify(message);
+  });
+
+  it('Notify - no nodes', function() {
+    var numTransactionEvents = 0;
+    var numModelEvents = 0;
+    var numTradeEvents = 0;
+    var numOfferChangedEvents = 0;
+
+    var remote = new Remote();
+    var book = remote.createOrderBook({
+      currency_gets: 'USD',
+      issuer_gets: addresses.ISSUER,
+      currency_pays: 'XRP'
+    });
+
+    book.on('transaction', function() {
+      numTransactionEvents += 1;
+    });
+
+    book.on('model', function() {
+      numModelEvents += 1;
+    });
+
+    book.on('trade', function() {
+      numTradeEvents += 1;
+    });
+
+    book.on('offer_changed', function() {
+      numOfferChangedEvents += 1;
+    });
+
+    book._subscribed = true;
+    book._issuerTransferRate = 1000000000;
+
+    book.setOffers(fixtures.FIAT_OFFERS);
+
+    var message = fixtures.transactionWithNoNodes();
+
+    book.notify(message);
+
+    assert.strictEqual(numTransactionEvents, 0);
+    assert.strictEqual(numModelEvents, 0);
+    assert.strictEqual(numTradeEvents, 0);
+    assert.strictEqual(numOfferChangedEvents, 0);
+  });
+
   it('Request offers', function(done) {
     var remote = new Remote();
 
     var offers = {
-      offers: [
-        {
-          Account: 'rGCHV41NxoK7wHQJhmao2RqjWZvBrTUhW1',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711A3A4254F5000',
-          BookNode: '0000000000000000',
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000000',
-          PreviousTxnID: '9BB337CC8B34DC8D1A3FFF468556C8BA70977C37F7436439D8DA19610F214AD1',
-          PreviousTxnLgrSeq: 8342933,
-          Sequence: 195,
-          TakerGets: {
-            currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.1129232560043778'
-          },
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '56.06639660617357'
-          },
-          index: 'B6BC3B0F87976370EE11F5575593FE63AA5DC1D602830DC96F04B2D597F044BF',
-          owner_funds: '0.1129267125000245',
-          quality: '496.5',
-          taker_gets_funded: {
-            currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.1127013098802639'
-          },
-          taker_pays_funded: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '55.95620035555103'
-          }
-        },
-        {
-          Account: 'raudnGKfTK23YKfnS7ixejHrqGERTYNFXk',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
-          PreviousTxnLgrSeq: 8342469,
-          Sequence: 29354,
-          TakerGets: {
-            currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.2'
-          },
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '0.950363009783092',
-          quality: '498.6116758238228'
-        },
-        {
-          Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
-          PreviousTxnLgrSeq: 8342469,
-          Sequence: 29356,
-          TakerGets: {
-            currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.5'
-          },
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '0.950363009783092',
-          quality: '498.6116758238228'
-        },
-        {
-          Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131078,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
-          PreviousTxnLgrSeq: 8342469,
-          Sequence: 29354,
-          TakerGets: {
-            currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.5'
-          },
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '0.950363009783092',
-          quality: '498.6116758238228'
-        }
-      ]
+      offers: fixtures.REQUEST_OFFERS
     };
 
     remote.request = function(request) {
@@ -1522,11 +1931,11 @@ describe('OrderBook', function() {
             id: void(0),
             taker_gets: {
               currency: '0000000000000000000000004254430000000000',
-              issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
+              issuer: addresses.ISSUER
             },
             taker_pays: {
               currency: '0000000000000000000000005553440000000000',
-              issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
+              issuer: addresses.ISSUER
             },
             taker: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
           });
@@ -1540,15 +1949,16 @@ describe('OrderBook', function() {
 
     var book = remote.createOrderBook({
       currency_gets: 'BTC',
-      issuer_gets: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+      issuer_gets: addresses.ISSUER,
       currency_pays: 'USD',
-      issuer_pays: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
+      issuer_pays: addresses.ISSUER
     });
 
     book._issuerTransferRate = 1002000000;
 
     var expected = [
-      { Account: 'rGCHV41NxoK7wHQJhmao2RqjWZvBrTUhW1',
+      { 
+        Account: addresses.ACCOUNT,
         BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711A3A4254F5000',
         BookNode: '0000000000000000',
         Flags: 131072,
@@ -1556,94 +1966,95 @@ describe('OrderBook', function() {
         OwnerNode: '0000000000000000',
         Sequence: 195,
         TakerGets: { currency: 'BTC',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+          issuer: addresses.ISSUER,
           value: '0.1129232560043778'
         },
         TakerPays: {
           currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+          issuer: addresses.ISSUER,
           value: '56.06639660617357'
         },
         index: 'B6BC3B0F87976370EE11F5575593FE63AA5DC1D602830DC96F04B2D597F044BF',
         owner_funds: '0.1129267125000245',
         taker_gets_funded: '0.112701309880264',
         taker_pays_funded: '55.95620035555106',
-        is_fully_funded: false },
-
-        { Account: 'raudnGKfTK23YKfnS7ixejHrqGERTYNFXk',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          Sequence: 29354,
-          TakerGets: {
-            currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.2'
-          },
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '0.950363009783092',
-          is_fully_funded: true,
-          taker_gets_funded: '0.2',
-          taker_pays_funded: '99.72233516476456'
+        is_fully_funded: false 
+      },
+      { 
+        Account: addresses.OTHER_ACCOUNT,
+        BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+        BookNode: '0000000000000000',
+        Expiration: 461498565,
+        Flags: 131072,
+        LedgerEntryType: 'Offer',
+        OwnerNode: '0000000000000144',
+        Sequence: 29354,
+        TakerGets: {
+          currency: 'BTC',
+          issuer: addresses.ISSUER,
+          value: '0.2'
         },
-
-        { Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          Sequence: 29356,
-          TakerGets: { currency: 'BTC',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '0.5'
-          },
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '0.950363009783092',
-          is_fully_funded: false,
-          taker_gets_funded: '0.5',
-          taker_pays_funded: '94.58325208561269' },
-
-          { Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
-            BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-            BookNode: '0000000000000000',
-            Expiration: 461498565,
-            Flags: 131078,
-            LedgerEntryType: 'Offer',
-            OwnerNode: '0000000000000144',
-            Sequence: 29354,
-            TakerGets: {
-              currency: 'BTC',
-              issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-              value: '0.5'
-            },
-            TakerPays: {
-              currency: 'USD',
-              issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-              value: '99.72233516476456'
-            },
-            index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-            owner_funds: '0.950363009783092',
-            is_fully_funded: false,
-            taker_gets_funded: '0.5',
-            taker_pays_funded: '94.58325208561269'
-          }
-    ]
-
+        TakerPays: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: '99.72233516476456'
+        },
+        index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+        owner_funds: '0.950363009783092',
+        is_fully_funded: true,
+        taker_gets_funded: '0.2',
+        taker_pays_funded: '99.72233516476456'
+      },
+      { 
+        Account: addresses.THIRD_ACCOUNT,
+        BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+        BookNode: '0000000000000000',
+        Expiration: 461498565,
+        Flags: 131072,
+        LedgerEntryType: 'Offer',
+        OwnerNode: '0000000000000144',
+        Sequence: 29356,
+        TakerGets: { currency: 'BTC',
+          issuer: addresses.ISSUER,
+          value: '0.5'
+        },
+        TakerPays: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: '99.72233516476456'
+        },
+        index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+        owner_funds: '0.950363009783092',
+        is_fully_funded: false,
+        taker_gets_funded: '0.5',
+        taker_pays_funded: '94.58325208561269' 
+      },
+      { 
+        Account: addresses.THIRD_ACCOUNT,
+        BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
+        BookNode: '0000000000000000',
+        Expiration: 461498565,
+        Flags: 131078,
+        LedgerEntryType: 'Offer',
+        OwnerNode: '0000000000000144',
+        Sequence: 29354,
+        TakerGets: {
+          currency: 'BTC',
+          issuer: addresses.ISSUER,
+          value: '0.5'
+        },
+        TakerPays: {
+          currency: 'USD',
+          issuer: addresses.ISSUER,
+          value: '99.72233516476456'
+        },
+        index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
+        owner_funds: '0.950363009783092',
+        is_fully_funded: false,
+        taker_gets_funded: '0.5',
+        taker_pays_funded: '94.58325208561269'
+      }
+    ];
 
     book.on('model', function(model) {
       assert.deepEqual(model, expected);
@@ -1652,90 +2063,16 @@ describe('OrderBook', function() {
     });
   });
 
-  it('Request offers -- native currency', function(done) {
+  it('Request offers - native currency', function(done) {
     var remote = new Remote();
 
     var offers = {
-      offers: [
-        {
-          Account: 'rGCHV41NxoK7wHQJhmao2RqjWZvBrTUhW1',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711A3A4254F5000',
-          BookNode: '0000000000000000',
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000000',
-          Sequence: 195,
-          TakerGets: '1000',
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '56.06639660617357'
-          },
-          index: 'B6BC3B0F87976370EE11F5575593FE63AA5DC1D602830DC96F04B2D597F044BF',
-          owner_funds: '600'
-        },
-        {
-          Account: 'raudnGKfTK23YKfnS7ixejHrqGERTYNFXk',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          Sequence: 29354,
-          TakerGets: '2000',
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '4000',
-        },
-        {
-          Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131072,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          Sequence: 29356,
-          TakerGets: '2000',
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          owner_funds: '3900',
-        },
-        {
-          Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
-          BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
-          BookNode: '0000000000000000',
-          Expiration: 461498565,
-          Flags: 131078,
-          LedgerEntryType: 'Offer',
-          OwnerNode: '0000000000000144',
-          PreviousTxnID: 'C8296B9CCA6DC594C7CD271C5D8FD11FEE380021A07768B25935642CDB37048A',
-          PreviousTxnLgrSeq: 8342469,
-          Sequence: 29354,
-          TakerGets: '2000',
-          TakerPays: {
-            currency: 'USD',
-            issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
-            value: '99.72233516476456'
-          },
-          index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
-          quality: '498.6116758238228'
-        }
-      ]
+      offers: fixtures.REQUEST_OFFERS_NATIVE
     };
 
     var expected = [
       {
-        Account: 'rGCHV41NxoK7wHQJhmao2RqjWZvBrTUhW1',
+        Account: addresses.ACCOUNT,
         BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711A3A4254F5000',
         BookNode: '0000000000000000',
         Flags: 131072,
@@ -1745,7 +2082,7 @@ describe('OrderBook', function() {
         TakerGets: '1000',
         TakerPays: {
           currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+          issuer: addresses.ISSUER,
           value: '56.06639660617357'
         },
         index: 'B6BC3B0F87976370EE11F5575593FE63AA5DC1D602830DC96F04B2D597F044BF',
@@ -1755,7 +2092,7 @@ describe('OrderBook', function() {
         taker_pays_funded: '33.63983796370414'
       },
       {
-        Account: 'raudnGKfTK23YKfnS7ixejHrqGERTYNFXk',
+        Account: addresses.OTHER_ACCOUNT,
         BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
         BookNode: '0000000000000000',
         Expiration: 461498565,
@@ -1766,7 +2103,7 @@ describe('OrderBook', function() {
         TakerGets: '2000',
         TakerPays: {
           currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+          issuer: addresses.ISSUER,
           value: '99.72233516476456'
         },
         index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
@@ -1776,7 +2113,7 @@ describe('OrderBook', function() {
         taker_pays_funded: '99.72233516476456'
       },
       {
-        Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
+        Account: addresses.THIRD_ACCOUNT,
         BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
         BookNode: '0000000000000000',
         Expiration: 461498565,
@@ -1787,7 +2124,7 @@ describe('OrderBook', function() {
         TakerGets: '2000',
         TakerPays: {
           currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+          issuer: addresses.ISSUER,
           value: '99.72233516476456'
         },
         index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
@@ -1797,7 +2134,7 @@ describe('OrderBook', function() {
         taker_pays_funded: '97.22927678564545'
       },
       {
-        Account: 'rwBG69mujDoD5yQfL3Sf7Yuh7rUNYdxe9Y',
+        Account: addresses.THIRD_ACCOUNT,
         BookDirectory: '6EAB7C172DEFA430DBFAD120FDC373B5F5AF8B191649EC985711B6D8C62EF414',
         BookNode: '0000000000000000',
         Expiration: 461498565,
@@ -1808,15 +2145,16 @@ describe('OrderBook', function() {
         TakerGets: '2000',
         TakerPays: {
           currency: 'USD',
-          issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B',
+          issuer: addresses.ISSUER,
           value: '99.72233516476456'
         },
         index: 'A437D85DF80D250F79308F2B613CF5391C7CF8EE9099BC4E553942651CD9FA86',
         is_fully_funded: false,
         taker_gets_funded: '2000',
-        taker_pays_funded: '97.22927678564545'
+        taker_pays_funded: '97.22927678564545',
+        owner_funds: '3900'
       }
-    ]
+    ];
 
     remote.request = function(request) {
       switch (request.message.command) {
@@ -1829,7 +2167,7 @@ describe('OrderBook', function() {
             },
             taker_pays: {
               currency: '0000000000000000000000005553440000000000',
-              issuer: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
+              issuer: addresses.ISSUER
             },
             taker: 'rrrrrrrrrrrrrrrrrrrrBZbvji'
           });
@@ -1844,7 +2182,7 @@ describe('OrderBook', function() {
     var book = remote.createOrderBook({
       currency_gets: 'XRP',
       currency_pays: 'USD',
-      issuer_pays: 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B'
+      issuer_pays: addresses.ISSUER
     });
 
     book.on('model', function(model) {
@@ -1853,4 +2191,4 @@ describe('OrderBook', function() {
       done();
     });
   });
-});
+});
\ No newline at end of file