diff --git a/CHANGELOG b/CHANGELOG
index f0f1a88550..5958838c1f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,9 @@
 Critical protocol changes
 -------------------------
 
-* date
 * The JSON field "metaData" changing to "meta".
 * RPC ledger will no longer take "ledger", use "ledger_hash" or "ledger_index".
-* "closedLedger" events:
+* "ledgerClose" events:
 ** "hash" DEPRECATED: use "ledger_hash"
 ** "seqNum" DEPRECATED: use "ledger_index"
 ** "closeTime" DEPRECATED: use "close" or "close_human"
diff --git a/test/send-test.js b/test/send-test.js
index e80964fc28..f105c008b5 100644
--- a/test/send-test.js
+++ b/test/send-test.js
@@ -152,12 +152,12 @@ buster.testCase("Sending", {
 //                console.log("BALANCE: %s", JSON.stringify(m));
 //                console.log("account_balance: %s", m.account_balance.to_text_full());
 //                console.log("account_limit: %s", m.account_limit.to_text_full());
-//                console.log("issuer_balance: %s", m.issuer_balance.to_text_full());
-//                console.log("issuer_limit: %s", m.issuer_limit.to_text_full());
+//                console.log("peer_balance: %s", m.peer_balance.to_text_full());
+//                console.log("peer_limit: %s", m.peer_limit.to_text_full());
                   buster.assert(m.account_balance.equals("0/USD/alice"));
                   buster.assert(m.account_limit.equals("800/USD/alice"));
-                  buster.assert(m.issuer_balance.equals("0/USD/mtgox"));
-                  buster.assert(m.issuer_limit.equals("0/USD/mtgox"));
+                  buster.assert(m.peer_balance.equals("0/USD/mtgox"));
+                  buster.assert(m.peer_limit.equals("0/USD/mtgox"));
 
                   callback();
                 })
@@ -173,8 +173,8 @@ buster.testCase("Sending", {
               .on('ripple_state', function (m) {
                   buster.assert(m.account_balance.equals("0/USD/alice"));
                   buster.assert(m.account_limit.equals("700/USD/alice"));
-                  buster.assert(m.issuer_balance.equals("0/USD/mtgox"));
-                  buster.assert(m.issuer_limit.equals("0/USD/mtgox"));
+                  buster.assert(m.peer_balance.equals("0/USD/mtgox"));
+                  buster.assert(m.peer_limit.equals("0/USD/mtgox"));
 
                   callback();
                 })
@@ -215,8 +215,8 @@ buster.testCase("Sending", {
                   // Used to keep lines.
                   // buster.assert(m.account_balance.equals("0/USD/alice"));
                   // buster.assert(m.account_limit.equals("0/USD/alice"));
-                  // buster.assert(m.issuer_balance.equals("0/USD/mtgox"));
-                  // buster.assert(m.issuer_limit.equals("0/USD/mtgox"));
+                  // buster.assert(m.peer_balance.equals("0/USD/mtgox"));
+                  // buster.assert(m.peer_limit.equals("0/USD/mtgox"));
 
                   buster.assert(false);
                 })
@@ -249,8 +249,8 @@ buster.testCase("Sending", {
 
                   buster.assert(m.account_balance.equals("0/USD/alice"));
                   buster.assert(m.account_limit.equals("600/USD/alice"));
-                  buster.assert(m.issuer_balance.equals("0/USD/bob"));
-                  buster.assert(m.issuer_limit.equals("500/USD/bob"));
+                  buster.assert(m.peer_balance.equals("0/USD/bob"));
+                  buster.assert(m.peer_limit.equals("500/USD/bob"));
 
                   callback();
                 })
@@ -263,8 +263,8 @@ buster.testCase("Sending", {
               .on('ripple_state', function (m) {
                   buster.assert(m.account_balance.equals("0/USD/bob"));
                   buster.assert(m.account_limit.equals("500/USD/bob"));
-                  buster.assert(m.issuer_balance.equals("0/USD/alice"));
-                  buster.assert(m.issuer_limit.equals("600/USD/alice"));
+                  buster.assert(m.peer_balance.equals("0/USD/alice"));
+                  buster.assert(m.peer_limit.equals("600/USD/alice"));
 
                   callback();
                 })
@@ -325,7 +325,7 @@ buster.testCase("Sending future", {
             self.remote.request_ripple_balance("alice", "bob", "USD", 'CURRENT')
               .once('ripple_state', function (m) {
                   buster.assert(m.account_balance.equals("-24/USD/alice"));
-                  buster.assert(m.issuer_balance.equals("24/USD/bob"));
+                  buster.assert(m.peer_balance.equals("24/USD/bob"));
 
                   callback();
                 })
@@ -351,7 +351,7 @@ buster.testCase("Sending future", {
             self.remote.request_ripple_balance("bob", "alice", "USD", 'CURRENT')
               .once('ripple_state', function (m) {
                   buster.assert(m.account_balance.equals("57/USD/bob"));
-                  buster.assert(m.issuer_balance.equals("-57/USD/alice"));
+                  buster.assert(m.peer_balance.equals("-57/USD/alice"));
 
                   callback();
                 })
@@ -473,8 +473,8 @@ buster.testCase("Sending future", {
 //            .once('ripple_state', function (m) {
 //                console.log("account_balance: %s", m.account_balance.to_text_full());
 //                console.log("account_limit: %s", m.account_limit.to_text_full());
-//                console.log("issuer_balance: %s", m.issuer_balance.to_text_full());
-//                console.log("issuer_limit: %s", m.issuer_limit.to_text_full());
+//                console.log("peer_balance: %s", m.peer_balance.to_text_full());
+//                console.log("peer_limit: %s", m.peer_limit.to_text_full());
 //
 //                buster.assert(m.account_balance.equals("600/USD/alice"));
 //
diff --git a/test/testutils.js b/test/testutils.js
index f809efacca..704480558f 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -171,19 +171,61 @@ var create_accounts = function (remote, src, amount, accounts, callback) {
 var credit_limit = function (remote, src, amount, callback) {
   assert(4 === arguments.length);
 
-  remote.transaction()
-    .ripple_line_set(src, amount)
-    .on('proposed', function (m) {
-        // console.log("proposed: %s", JSON.stringify(m));
+  var _m      = amount.match(/^(\d+\/...\/[^\/]+)(?:(\d+)(?:\/(\d+))?)?$/);
+  if (!_m) {
+    console.log("credit_limit: parse error: %s", amount);
 
-        callback(m.result != 'tesSUCCESS');
-      })
-    .on('error', function (m) {
-        // console.log("error: %s", JSON.stringify(m));
+    callback('parse_error');
+  }
+  else
+  {
+    remote.transaction()
+      .ripple_line_set(src, _m[1], _m[2], _m[3])
+      .on('proposed', function (m) {
+          // console.log("proposed: %s", JSON.stringify(m));
 
-        callback(m);
-      })
-    .submit();
+          callback(m.result != 'tesSUCCESS');
+        })
+      .on('error', function (m) {
+          // console.log("error: %s", JSON.stringify(m));
+
+          callback(m);
+        })
+      .submit();
+  }
+};
+
+var verify_limit = function (remote, src, amount, callback) {
+  assert(4 === arguments.length);
+
+  var _m      = amount.match(/^(\d+\/...\/[^\/]+)(?:(\d+)(?:\/(\d+))?)?$/);
+  if (!_m) {
+    console.log("credit_limit: parse error: %s", amount);
+
+    callback('parse_error');
+  }
+  else
+  {
+    var _account_limit  = _m[1];
+    var _quality_in     = _m[2];
+    var _quality_out    = _m[3];
+
+    remote.request_ripple_balance()
+      .once('ripple_state', function (m) {
+          // console.log("proposed: %s", JSON.stringify(m));
+          buster.assert(m.account_limit.equals(_account_limit));
+          buster.assert('undefined' === _quality_in || m.account_quality_in.equals(_quality_in));
+          buster.assert('undefined' === _quality_out || m.account_quality_out.equals(_quality_out));
+
+          callback(m.result != 'tesSUCCESS');
+        })
+      .on('error', function (m) {
+          // console.log("error: %s", JSON.stringify(m));
+
+          callback(m);
+        })
+      .submit();
+  }
 };
 
 var credit_limits = function (remote, balances, callback) {