diff --git a/BeastConfig.h b/BeastConfig.h
index 16d4f239e8..47adbde46b 100644
--- a/BeastConfig.h
+++ b/BeastConfig.h
@@ -120,6 +120,6 @@
 //#define BEAST_BIND_USES_TR1   1
 //#define BEAST_BIND_USES_BOOST 1
 
-#define BEAST_UNIT_TESTS 1
+//#define BEAST_UNIT_TESTS 1
 
 #endif
diff --git a/modules/ripple_app/node/ripple_NodeStore.h b/modules/ripple_app/node/ripple_NodeStore.h
index 8e6de63fcc..dc21f4c2f4 100644
--- a/modules/ripple_app/node/ripple_NodeStore.h
+++ b/modules/ripple_app/node/ripple_NodeStore.h
@@ -41,6 +41,9 @@ public:
 
         // Visit every object in the database
         // This function will only be called during an import operation
+        //
+        // VFALCO TODO Replace FUNCTION_TYPE with a beast lift.
+        //
         virtual void visitAll (FUNCTION_TYPE <void (NodeObject::pointer)>) = 0;
 
         // VFALCO TODO Put this bulk writing logic into a separate class.
diff --git a/modules/ripple_core/validator/ripple_Validator.h b/modules/ripple_core/validator/ripple_Validator.h
index de3a9c39c9..356a5532b4 100644
--- a/modules/ripple_core/validator/ripple_Validator.h
+++ b/modules/ripple_core/validator/ripple_Validator.h
@@ -14,7 +14,7 @@
 class Validator
 {
 public:
-    typedef RippleAddress PublicKey;
+    typedef uint256 PublicKey;
 
     explicit Validator (PublicKey const& publicKey);
 
diff --git a/modules/ripple_core/validator/ripple_Validators.cpp b/modules/ripple_core/validator/ripple_Validators.cpp
index 14d9d600d8..da4af23287 100644
--- a/modules/ripple_core/validator/ripple_Validators.cpp
+++ b/modules/ripple_core/validator/ripple_Validators.cpp
@@ -218,3 +218,23 @@ Validators* Validators::New (Listener* listener)
 {
     return new ValidatorsImp (listener);
 }
+
+//------------------------------------------------------------------------------
+
+/** Produces validators for unit tests.
+*/
+class TestValidatorSource : public Validators::Source
+{
+public:
+    static Validator makeValidator (int publicKeyIndex)
+    {
+
+    }
+
+    ValidatorList::Ptr fetch ()
+    {
+        ValidatorList::Ptr list = new ValidatorList;
+
+        return list;
+    }
+};