diff --git a/src/js/amount.js b/src/js/amount.js
index bd62ab551c..94bdc12c3b 100644
--- a/src/js/amount.js
+++ b/src/js/amount.js
@@ -282,10 +282,10 @@ var Amount = function () {
   this._value	    = new BigInteger();	// NaN for bad value. Always positive for non-XRP.
   this._offset	    = undefined;	// For non-XRP.
   this._is_native   = true;		// Default to XRP. Only valid if value is not NaN.
-  this._is_negative  = undefined;	// Undefined for XRP.
+  this._is_negative = undefined;	// For non-XRP. Undefined for XRP.
 
-  this.currency	    = new Currency();
-  this.issuer	    = new UInt160();
+  this._currency    = new Currency();
+  this._issuer	    = new UInt160();
 };
 
 // Given "100/USD/mtgox" return the a string with mtgox remapped.
@@ -320,25 +320,33 @@ Amount.prototype.copyTo = function(d, negate) {
     d._value   = this._value;
   }
 
-  d._offset	= this._offset;
-  d._is_native	= this._is_native;
-  d._is_negative	= this._is_native
-		    ? undefined		    // Native sign in BigInteger.
-		    : negate
-		      ? !this._is_negative   // Negating.
-		      : this._is_negative;   // Just copying.
+  d._offset	  = this._offset;
+  d._is_native	  = this._is_native;
+  d._is_negative  = this._is_native
+		      ? undefined		    // Native sign in BigInteger.
+		      : negate
+			? !this._is_negative   // Negating.
+			: this._is_negative;   // Just copying.
 
-  this.currency.copyTo(d.currency);
-  this.issuer.copyTo(d.issuer);
+  this._currency.copyTo(d._currency);
+  this._issuer.copyTo(d._issuer);
 
   return d;
 };
 
+Amount.prototype.currency = function() {
+  return this._currency;
+};
+
 // YYY Might also provide is_valid_json.
 Amount.prototype.is_valid = function() {
   return !isNaN(this._value);
 };
 
+Amount.prototype.issuer = function() {
+  return this._issuer;
+};
+
 // Convert only value to JSON wire format.
 Amount.prototype.to_text = function(allow_nan) {
   if (isNaN(this._value)) {
@@ -382,7 +390,7 @@ Amount.prototype.to_text = function(allow_nan) {
 };
 
 Amount.prototype.canonicalize = function() {
-  if (isNaN(this._value) || !this.currency) {
+  if (isNaN(this._value) || !this._currency) {
     // nothing
   }
   else if (this._value.equals(BigInteger.ZERO)) {
@@ -422,8 +430,8 @@ Amount.prototype.to_json = function() {
   {
     return {
       'value' : this.to_text(),
-      'currency' : this.currency.to_json(),
-      'issuer' : this.issuer.to_json(),
+      'currency' : this._currency.to_json(),
+      'issuer' : this._issuer.to_json(),
     };
   }
 };
@@ -433,7 +441,7 @@ Amount.prototype.to_text_full = function() {
     ? NaN
     : this._is_native
       ? this.to_text() + "/XRP"
-      : this.to_text() + "/" + this.currency.to_json() + "/" + this.issuer.to_json();
+      : this.to_text() + "/" + this._currency.to_json() + "/" + this._issuer.to_json();
 };
 
 // Parse a XRP value from untrusted input.
@@ -488,7 +496,7 @@ Amount.prototype.parse_value = function(j) {
     this._is_negative  = j < 0;
       if (this._is_negative) j = -j;
     this._value	      = new BigInteger(j);
-    this._offset	      = 0;
+    this._offset      = 0;
 
     this.canonicalize();
   } 
@@ -502,7 +510,7 @@ Amount.prototype.parse_value = function(j) {
     
       this._value	= new BigInteger(e[2]);
       this._offset 	= parseInt(e[3]);
-      this._is_negative  = !!e[1];
+      this._is_negative	= !!e[1];
 
       this.canonicalize();
     }
@@ -515,7 +523,7 @@ Amount.prototype.parse_value = function(j) {
 
       this._value      	= integer.multiply(exports.consts.bi_10.clone().pow(precision)).add(fraction);
       this._offset     	= -precision;
-      this._is_negative  = !!d[1];
+      this._is_negative = !!d[1];
 
       this.canonicalize();
     }
@@ -550,13 +558,13 @@ Amount.prototype.parse_json = function(j) {
 
     if (m) {
       this.parse_value(m[1]);
-      this.currency = Currency.from_json(m[2]);
-      this.issuer   = UInt160.from_json(m[3]);
+      this._currency  = Currency.from_json(m[2]);
+      this._issuer    = UInt160.from_json(m[3]);
     }
     else {
       this.parse_native(j);
-      this.currency = new Currency();
-      this.issuer   = new UInt160();
+      this._currency  = new Currency();
+      this._issuer    = new UInt160();
     }
   }
   else if ('object' === typeof j && j.constructor == Amount) {
@@ -566,8 +574,8 @@ Amount.prototype.parse_json = function(j) {
     // Parse the passed value to sanitize and copy it.
 
     this.parse_value(j.value);
-    this.currency.parse_json(j.currency);     // Never XRP.
-    this.issuer.parse_json(j.issuer);
+    this._currency.parse_json(j.currency);     // Never XRP.
+    this._issuer.parse_json(j.issuer);
   }
   else {
     this._value	    = NaN;
@@ -577,7 +585,7 @@ Amount.prototype.parse_json = function(j) {
 };
 
 Amount.prototype.parse_issuer = function (issuer) {
-  this.issuer.parse_json(issuer);
+  this._issuer.parse_json(issuer);
 
   return this;
 };
diff --git a/src/js/remote.js b/src/js/remote.js
index bdca2f3f75..a9433bdda9 100644
--- a/src/js/remote.js
+++ b/src/js/remote.js
@@ -844,7 +844,7 @@ Remote.prototype.request_ripple_balance = function (account, issuer, currency, c
 	// The amount the low account holds of issuer.
 	var balance	    = Amount.from_json(node.Balance);
 	// accountHigh implies: for account: balance is negated, highLimit is the limit set by account.
-	var accountHigh	    = UInt160.from_json(account).equals(highLimit.issuer);
+	var accountHigh	    = UInt160.from_json(account).equals(highLimit.issuer());
 	// The limit set by account.
 	var accountLimit    = (accountHigh ? highLimit : lowLimit).parse_issuer(account);
 	// The limit set by issuer.
diff --git a/test/offer-test.js b/test/offer-test.js
index b1910cf599..988136364d 100644
--- a/test/offer-test.js
+++ b/test/offer-test.js
@@ -339,8 +339,6 @@ buster.testCase("Offer tests", {
       var self = this;
       var seq;
 
-      self.remote.set_trace();
-
       async.waterfall([
 	  function (callback) {
 	    self.what = "Create accounts.";
@@ -367,6 +365,8 @@ buster.testCase("Offer tests", {
 	      callback);
 	  },
 	  function (callback) {
+	    self.what = "Create offer.";
+
 	    self.remote.transaction()
 	      .offer_create("bob", "100/USD/mtgox", "500")
 	      .on('proposed', function (m) {
@@ -389,7 +389,7 @@ buster.testCase("Offer tests", {
 	      .payment("alice", "alice", "500")
 	      .send_max("100/USD/mtgox")
 	      .on('proposed', function (m) {
-		  console.log("proposed: %s", JSON.stringify(m));
+		  // console.log("proposed: %s", JSON.stringify(m));
 
 		  callback(m.result !== 'tesSUCCESS');
 		})
@@ -421,8 +421,6 @@ buster.testCase("Offer tests", {
       var self = this;
       var seq;
 
-      self.remote.set_trace();
-
       async.waterfall([
 	  function (callback) {
 	    self.what = "Create accounts.";
@@ -449,6 +447,8 @@ buster.testCase("Offer tests", {
 	      callback);
 	  },
 	  function (callback) {
+	    self.what = "Create offer.";
+
 	    self.remote.transaction()
 	      .offer_create("bob", "100/USD/mtgox", "500")
 	      .on('proposed', function (m) {
@@ -466,7 +466,7 @@ buster.testCase("Offer tests", {
 	      .payment("alice", "alice", "200")
 	      .send_max("100/USD/mtgox")
 	      .on('proposed', function (m) {
-		  console.log("proposed: %s", JSON.stringify(m));
+		  // console.log("proposed: %s", JSON.stringify(m));
 
 		  callback(m.result !== 'tesSUCCESS');
 		})
@@ -494,10 +494,8 @@ buster.testCase("Offer tests", {
 	      .payment("alice", "alice", "600")
 	      .send_max("100/USD/mtgox")
 	      .on('proposed', function (m) {
-		  console.log("proposed: %s", JSON.stringify(m));
+		  // console.log("proposed: %s", JSON.stringify(m));
 
-		  console.log("callback: %d", m.result !== 'tepPATH_PARTIAL');
-		  console.log("callback: %s", m.result);
 		  callback(m.result !== 'tepPATH_PARTIAL');
 		})
 	      .submit();
@@ -510,7 +508,7 @@ buster.testCase("Offer tests", {
 	      .send_max("100/USD/mtgox")
 	      .set_flags('PartialPayment')
 	      .on('proposed', function (m) {
-		  console.log("proposed: %s", JSON.stringify(m));
+		  // console.log("proposed: %s", JSON.stringify(m));
 
 		  callback(m.result !== 'tesSUCCESS');
 		})
diff --git a/test/send-test.js b/test/send-test.js
index 6d16fb796c..77811d3015 100644
--- a/test/send-test.js
+++ b/test/send-test.js
@@ -13,7 +13,7 @@ require("../src/js/remote.js").config = require("./config.js");
 // How long to wait for server to start.
 var serverDelay = 1500;
 
-buster.testRunner.timeout = 3000;
+buster.testRunner.timeout = 5000;
 
 buster.testCase("Sending", {
   'setUp' : testutils.build_setup(),
@@ -451,7 +451,7 @@ buster.testCase("Sending future", {
 });
 
 buster.testCase("Indirect ripple", {
-  'setUp' : testutils.build_setup({ verbose: false, no_server: false }),
+  'setUp' : testutils.build_setup(),
   'tearDown' : testutils.build_teardown(),
 
   "indirect ripple" :
diff --git a/test/testutils.js b/test/testutils.js
index b59d46ae18..9c31e3c2e6 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -187,7 +187,7 @@ var payments = function (remote, balances, callback) {
       var amount_json = values[index];
       var amount      = Amount.from_json(amount_json);
 
-      sends.push( { "source" : src, "destination" : amount.issuer.to_json(), "amount" : amount_json } );
+      sends.push( { "source" : src, "destination" : amount.issuer().to_json(), "amount" : amount_json } );
     }
   }
 
@@ -229,7 +229,7 @@ var verify_balance = function (remote, src, amount_json, callback) {
     callback();
   }
   else {
-    remote.request_ripple_balance(src, amount.issuer.to_json(), amount.currency.to_json(), 'CURRENT')
+    remote.request_ripple_balance(src, amount.issuer().to_json(), amount.currency().to_json(), 'CURRENT')
       .once('ripple_state', function (m) {
   //	console.log("BALANCE: %s", JSON.stringify(m));
   //	console.log("account_balance: %s", m.account_balance.to_text_full());
@@ -303,7 +303,7 @@ var verify_offer_not_found = function (remote, owner, seq, callback) {
 	callback('entryFound');
       })
     .on('error', function (m) {
-	console.log("verify_no_offer: success: %s", JSON.stringify(m));
+	// console.log("verify_no_offer: success: %s", JSON.stringify(m));
 
 	callback('remoteError' !== m.error
 	  || 'entryNotFound' !== m.remote.error);