diff --git a/lib/neography/rest/node_indexes.rb b/lib/neography/rest/node_indexes.rb
index f8e638b..049463f 100644
--- a/lib/neography/rest/node_indexes.rb
+++ b/lib/neography/rest/node_indexes.rb
@@ -13,7 +13,9 @@ class NodeIndexes
       add_path :key_value, "/index/node/:index/:key/:value"
       add_path :query,     "/index/node/:index?query=:query"
 
-      add_path :key_value2, "/index/node/:index/:key?query=\":value\"" # TODO FIX BUG %20
+      # this should be the same as the :key_value path above
+      # was changed to ?query="..." to fix bug with spaces and slashes
+      add_path :key_value2, "/index/node/:index/:key?query=\":value\""
 
       def initialize(connection)
         @connection = connection
@@ -42,10 +44,10 @@ def create_auto(type, provider)
         create("node_auto_index", type, provider)
       end
 
-      def create_unique(index, key, value, props)
+      def create_unique(index, key, value, properties)
         options = {
           :body => (
-            { :properties => props,
+            { :properties => properties,
               :key => key,
               :value => value
             }
diff --git a/spec/unit/rest/node_indexes_spec.rb b/spec/unit/rest/node_indexes_spec.rb
new file mode 100644
index 0000000..5332cdd
--- /dev/null
+++ b/spec/unit/rest/node_indexes_spec.rb
@@ -0,0 +1,101 @@
+require 'spec_helper'
+
+module Neography
+  class Rest
+    describe NodeIndexes do
+
+      let(:connection) { stub(:configuration => "http://configuration") }
+      subject { NodeIndexes.new(connection) }
+
+      it "lists all indexes" do
+        connection.should_receive(:get).with("/index/node")
+        subject.list
+      end
+
+      it "creates a node index" do
+        expected_body = {
+          "config" => {
+            "type" => "some_type",
+            "provider" => "some_provider"
+          },
+          "name" => "some_index"
+        }
+        connection.should_receive(:post).with("/index/node", json_match(:body, expected_body))
+        subject.create("some_index", "some_type", "some_provider")
+      end
+
+      it "returns the post result after creation" do
+        connection.stub(:post).and_return("foo")
+        subject.create("some_index", "some_type", "some_provider").should == "foo"
+      end
+
+      it "creates an auto-index" do
+        expected_body = {
+          "config" => {
+            "type" => "some_type",
+            "provider" => "some_provider"
+          },
+          "name" => "node_auto_index"
+        }
+        connection.should_receive(:post).with("/index/node", json_match(:body, expected_body))
+        subject.create_auto("some_type", "some_provider")
+      end
+
+      it "creates a unique node in an index" do
+        expected_body = {
+          "properties" => "properties",
+          "key" => "key",
+          "value" => "value"
+        }
+        connection.should_receive(:post).with("/index/node/some_index?unique", json_match(:body, expected_body))
+        subject.create_unique("some_index", "key", "value", "properties")
+      end
+
+      it "adds a node to an index" do
+        expected_body = {
+          "uri" => "http://configuration/node/42",
+          "key" => "key",
+          "value" => "value"
+        }
+        connection.should_receive(:post).with("/index/node/some_index", json_match(:body, expected_body))
+        subject.add("some_index", "key", "value", "42")
+      end
+
+      it "gets a node from an index" do
+        connection.should_receive(:get).with("/index/node/some_index/some_key/some_value")
+        subject.get("some_index", "some_key", "some_value")
+      end
+
+      it "returns nil if nothing was found in the index" do
+        connection.stub(:get).and_return(nil)
+        subject.get("some_index", "some_key", "some_value").should be_nil
+      end
+
+      it "finds by key and value" do
+        connection.should_receive(:get).with("/index/node/some_index/some_key?query=\"some_value\"")
+        subject.find_by_value("some_index", "some_key", "some_value")
+      end
+
+      it "finds by query" do
+        connection.should_receive(:get).with("/index/node/some_index?query=some_query")
+        subject.find_by_query("some_index", "some_query")
+      end
+
+      it "removed a node from an index" do
+        connection.should_receive(:delete).with("/index/node/some_index/42")
+        subject.remove("some_index", "42")
+      end
+
+      it "removed a node from an index by key" do
+        connection.should_receive(:delete).with("/index/node/some_index/some_key/42")
+        subject.remove_by_key("some_index", "42", "some_key")
+      end
+
+      it "removed a node from an index by key and value" do
+        connection.should_receive(:delete).with("/index/node/some_index/some_key/some_value/42")
+        subject.remove_by_value("some_index", "42", "some_key", "some_value")
+      end
+
+    end
+  end
+end