diff --git a/red/cli/lib/config.js b/red/cli/lib/config.js
index 98c274b14..3cd5244da 100644
--- a/red/cli/lib/config.js
+++ b/red/cli/lib/config.js
@@ -44,6 +44,10 @@ function save() {
     }
     fs.writeFileSync(configFile,JSON.stringify(config,null,4));
 }
-module.exports = {};
+module.exports = {
+    unload: function() {
+        config = null;
+    }
+};
 module.exports.__defineGetter__('target',function() { load(); return config.target|| "http://localhost:1880" });
 module.exports.__defineSetter__('target',function(v) { load(); config.target = v; save();});
diff --git a/red/cli/lib/request.js b/red/cli/lib/request.js
index 798ed9079..9322b75da 100644
--- a/red/cli/lib/request.js
+++ b/red/cli/lib/request.js
@@ -27,7 +27,18 @@ module.exports = function(path, options) {
             options.headers['content-type'] = 'application/json';
         }
         options.url = basePath+path;
-        request(options, function(error,response,body) {
+        
+        // Pull out the request function so we can stub it in the tests
+        var requestFunc = request.get;
+        
+        if (options.method == 'PUT') {
+            requestFunc = request.put;
+        } else if (options.method == 'POST') {
+            requestFunc = request.post;
+        } else if (options.method == 'DELETE') {
+            requestFunc = request.delete;
+        }
+        requestFunc(options, function(error,response,body) {
             if (!error && response.statusCode == 200) {
                 resolve(JSON.parse(body));
             } else if (error) {
diff --git a/test/red/cli/lib/config_spec.js b/test/red/cli/lib/config_spec.js
index 59a5c641f..68e960af5 100644
--- a/test/red/cli/lib/config_spec.js
+++ b/test/red/cli/lib/config_spec.js
@@ -12,4 +12,42 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- **/
\ No newline at end of file
+ **/
+ 
+var should = require("should");
+var sinon = require("sinon");
+var fs = require("fs");
+
+var config = require("../../../../red/cli/lib/config");
+
+describe("cli config", function() {
+    afterEach(function() {
+        config.unload();
+    });
+    it('loads preferences when target referenced', sinon.test(function() {
+        this.stub(fs,"readFileSync",function() {
+            return '{"target":"http://example.com:1880"}'
+        });
+        config.target.should.eql("http://example.com:1880");
+    }));
+    it('provide default value for target', sinon.test(function() {
+        this.stub(fs,"readFileSync",function() {
+            return '{}'
+        });
+        config.target.should.eql("http://localhost:1880");
+    }));
+    it('saves preferences when target set', sinon.test(function() {
+        this.stub(fs,"readFileSync",function() {
+            return '{"target":"http://another.example.com:1880"}'
+        });
+        this.stub(fs,"writeFileSync",function() {});
+        
+        config.target.should.eql("http://another.example.com:1880");
+        config.target = "http://final.example.com:1880";
+        
+        fs.readFileSync.calledOnce.should.be.true;
+        fs.writeFileSync.calledOnce.should.be.true;
+        
+    }));
+        
+});
\ No newline at end of file
diff --git a/test/red/cli/lib/request_spec.js b/test/red/cli/lib/request_spec.js
index 59a5c641f..7d2b5ac77 100644
--- a/test/red/cli/lib/request_spec.js
+++ b/test/red/cli/lib/request_spec.js
@@ -12,4 +12,35 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- **/
\ No newline at end of file
+ **/
+ 
+var should = require("should");
+var sinon = require("sinon");
+var fs = require("fs");
+var request = require("request");
+
+var apiRequest = require("../../../../red/cli/lib/request");
+var config = require("../../../../red/cli/lib/config");
+
+describe("cli request", function() {
+    var sandbox = sinon.sandbox.create();
+    before(function() {
+        sandbox.stub(fs,"readFileSync",function() {
+            return '{"target":"http://example.com:1880"}'
+        });
+    });
+    after(function() {
+        sandbox.restore();
+    });
+                
+    it('returns the json response to a get', sinon.test(function(done) {
+        this.stub(request, 'get').yields(null, {statusCode:200}, JSON.stringify({a: "b"}));
+            
+        apiRequest("/foo",{}).then(function(res) {
+            res.should.eql({a:"b"});
+            done();
+        }).otherwise(function(err) {
+            done(err);
+        });
+    }));
+});
\ No newline at end of file