foo.diff

diff --git a/src/main/java/com/etsy/pushbot/Member.java b/src/main/java/com/etsy/pushbot/Member.java
index ffbd80e..320f94d 100644
--- a/src/main/java/com/etsy/pushbot/Member.java
+++ b/src/main/java/com/etsy/pushbot/Member.java
@@ -5,8 +5,9 @@ import com.etsy.pushbot.config.ConfigDao;
 
 public class Member {
 
-  public static StaffDataFetcher staffDataFetcher = new DatafeedsStaffDataFetcher();
+  public static boolean useTestStaffDataFetcher = false;
 
+  private StaffDataFetcher staffDataFetcher;
   private String name;
   private String type = null;
   private String status = null;
@@ -15,6 +16,7 @@ public class Member {
 
   public Member(String name) {
     this.name = name;
+    staffDataFetcher = useTestStaffDataFetcher ? new StaffDataFetcherTesting() : new DatafeedsStaffDataFetcher();
 
     try {
       staffDataFetcher.populateStaffDataForName(this.name);
diff --git a/src/test/java/com/etsy/pushbot/PushBotTest.java b/src/test/java/com/etsy/pushbot/PushBotTest.java
index 72c1050..000c6c7 100644
--- a/src/test/java/com/etsy/pushbot/PushBotTest.java
+++ b/src/test/java/com/etsy/pushbot/PushBotTest.java
@@ -26,11 +26,11 @@ public class PushBotTest extends TestCase {
     }
 
     protected void setUp() throws Exception {
-        Member.staffDataFetcher = new StaffDataFetcherTesting();
+        Member.useTestStaffDataFetcher = true;
     }
 
     protected void tearDown() throws Exception {
-        Member.staffDataFetcher = new DatafeedsStaffDataFetcher();
+        Member.useTestStaffDataFetcher = false;
     }
 
     private void assertPushTrainEquals(String target, String source) {
diff --git a/src/test/java/com/etsy/pushbot/PushTrainTest.java b/src/test/java/com/etsy/pushbot/PushTrainTest.java
index 0e1773e..1f036e5 100644
--- a/src/test/java/com/etsy/pushbot/PushTrainTest.java
+++ b/src/test/java/com/etsy/pushbot/PushTrainTest.java
@@ -24,11 +24,11 @@ public class PushTrainTest extends TestCase {
   }
 
   protected void setUp() throws Exception {
-    Member.staffDataFetcher = new StaffDataFetcherTesting();
+    Member.useTestStaffDataFetcher = true;
   }
 
   protected void tearDown() throws Exception {
-    Member.staffDataFetcher = new DatafeedsStaffDataFetcher();
+    Member.useTestStaffDataFetcher = false;
   }
 
   private void assertEqualsMsg(String expected, String actual) {