diff --git a/package.json b/package.json
index 7ccfd56a2c..329eb8713a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   },
 
   "dependencies": {
-    "ripple-lib": "0.7.37",
+    "ripple-lib": "0.8.2",
     "async": "~0.2.9",
     "extend": "~1.2.0",
     "simple-jsonrpc": "~0.0.2",
diff --git a/test/orderbook-test.js b/test/orderbook-test.js
new file mode 100644
index 0000000000..4e62eadcc9
--- /dev/null
+++ b/test/orderbook-test.js
@@ -0,0 +1,216 @@
+var async       = require('async');
+var assert      = require('assert');
+var Account     = require('ripple-lib').UInt160;
+var Remote      = require('ripple-lib').Remote;
+var Transaction = require('ripple-lib').Transaction;
+var testutils   = require('./testutils');
+var config      = testutils.init_config();
+  
+suite('Order Book', function() {
+  var $ = { };
+ 
+  setup(function(done) {
+    testutils.build_setup().call($, done);
+  });
+ 
+  teardown(function(done) {
+    testutils.build_teardown().call($, done);
+  });
+ 
+  test('Track offers', function (done) {
+    var self = this;
+ 
+    var steps = [
+      function(callback) {
+          self.what = 'Create accounts';
+
+          testutils.create_accounts(
+            $.remote,
+            'root',
+            '20000.0',
+            [ 'mtgox', 'alice', 'bob' ],
+            callback
+          );
+      },
+ 
+      function waitLedgers(callback) {
+        self.what = 'Wait ledger';
+
+        $.remote.once('ledger_closed', function() {
+          callback();
+        });
+ 
+        $.remote.ledger_accept();
+      },
+ 
+      function verifyBalance(callback) {
+        self.what = 'Verify balance';
+
+        testutils.verify_balance(
+          $.remote,
+          [ 'mtgox', 'alice', 'bob' ],
+          '20000000000',
+          callback
+        );
+      },
+ 
+      function (callback) {
+        self.what = 'Set transfer rate';
+ 
+        var tx = $.remote.transaction('AccountSet', {
+          account: 'mtgox'
+        });
+ 
+        tx.transferRate(1.1 * 1e9);
+ 
+        tx.submit(function(err, m) {
+          assert.ifError(err);
+          assert.strictEqual(m.engine_result, 'tesSUCCESS');
+          callback();
+        });
+ 
+        testutils.ledger_wait($.remote, tx);
+      },
+ 
+      function (callback) {
+        self.what = 'Set limits';
+ 
+        testutils.credit_limits($.remote, {
+          'alice' : '1000/USD/mtgox',
+          'bob' : '1000/USD/mtgox'
+        },
+        callback);
+      },
+ 
+      function (callback) {
+        self.what = 'Distribute funds';
+ 
+        testutils.payments($.remote, {
+          'mtgox' : [ '100/USD/alice', '50/USD/bob' ]
+        },
+        callback);
+      },
+ 
+      function (callback) {
+        self.what = 'Create offer';
+ 
+        // get 4000/XRP pay 10/USD : offer pays 10 USD for 4000 XRP
+        var tx = $.remote.transaction('OfferCreate', {
+          account: 'alice',
+          taker_pays: '4000',
+          taker_gets: '10/USD/mtgox'
+        });
+ 
+        tx.submit(function(err, m) {
+          assert.ifError(err);
+          assert.strictEqual(m.engine_result, 'tesSUCCESS');
+          callback();
+        });
+ 
+        testutils.ledger_wait($.remote, tx);
+      },
+ 
+      function (callback) {
+        self.what = 'Create order book';
+
+        var ob = $.remote.createOrderBook({
+          currency_pays: 'XRP',
+          issuer_gets: Account.json_rewrite('mtgox'),
+          currency_gets: 'USD'
+        });
+ 
+        ob.on('model', function(){});
+
+        ob.getOffers(function(err, offers) {
+          assert.ifError(err);
+          //console.log('OFFERS', offers);
+          
+          var expected = [
+              { Account: 'rG1QQv2nh2gr7RCZ1P8YYcBUKCCN633jCn',
+                BookDirectory: 'AE0A97F385FFE42E3096BA3F98A0173090FE66A3C2482FE0570E35FA931A0000',
+                BookNode: '0000000000000000',
+                Flags: 0,
+                LedgerEntryType: 'Offer',
+                OwnerNode: '0000000000000000',
+                PreviousTxnID: offers[0].PreviousTxnID,
+                PreviousTxnLgrSeq: offers[0].PreviousTxnLgrSeq,
+                Sequence: 2,
+                TakerGets: { currency: 'USD',
+                  issuer: 'rGihwhaqU8g7ahwAvTq6iX5rvsfcbgZw6v',
+                  value: '10'
+                },
+                TakerPays: '4000',
+                index: 'CD6AE78EE0A5438978501A0404D9093597F57B705D566B5070D58BD48F98468C',
+                owner_funds: '100',
+                quality: '400',
+                is_fully_funded: true,
+                taker_gets_funded: '10',
+                taker_pays_funded: '4000' }
+          ]
+          assert.deepEqual(offers, expected);
+ 
+          callback(null, ob);
+        });
+      },
+
+      function (ob, callback) {
+        self.what = 'Create offer';
+ 
+        // get 5/USD pay 2000/XRP: offer pays 2000 XRP for 5 USD 
+        var tx = $.remote.transaction('OfferCreate', {
+          account: 'bob',
+          taker_pays: '5/USD/mtgox',
+          taker_gets: '2000',
+        });
+ 
+        tx.submit(function(err, m) {
+          assert.ifError(err);
+          assert.strictEqual(m.engine_result, 'tesSUCCESS');
+          callback(null, ob);
+        });
+ 
+        testutils.ledger_wait($.remote, tx);
+      },      
+      
+      function (ob, callback) {
+        self.what = 'Check order book tracking';   
+
+        ob.getOffers(function(err, offers) {
+          assert.ifError(err);
+          //console.log('OFFERS', offers);
+
+          var expected = [
+              { Account: 'rG1QQv2nh2gr7RCZ1P8YYcBUKCCN633jCn',
+                BookDirectory: 'AE0A97F385FFE42E3096BA3F98A0173090FE66A3C2482FE0570E35FA931A0000',
+                BookNode: '0000000000000000',
+                Flags: 0,
+                LedgerEntryType: 'Offer',
+                OwnerNode: '0000000000000000',
+                PreviousTxnID: offers[0].PreviousTxnID,                
+                PreviousTxnLgrSeq: offers[0].PreviousTxnLgrSeq,
+                Sequence: 2,
+                TakerGets: 
+                 { currency: 'USD',
+                   issuer: 'rGihwhaqU8g7ahwAvTq6iX5rvsfcbgZw6v',
+                   value: '5' },
+                TakerPays: '2000',
+                index: 'CD6AE78EE0A5438978501A0404D9093597F57B705D566B5070D58BD48F98468C',
+                owner_funds: '94.5',
+                quality: '400',
+                is_fully_funded: true,
+                taker_gets_funded: '5',
+                taker_pays_funded: '2000' }
+          ]
+          assert.deepEqual(offers, expected);
+
+          callback();
+        });
+      },
+    ];
+ 
+    async.waterfall(steps, function (error) {
+      assert(!error, self.what + ': ' + error);
+      done();
+    });
+  });
+});