Refactor keys and queries in datastore service and implementation.

filter/count/count_test.go

Index: filter/count/count_test.go
diff --git a/filter/count/count_test.go b/filter/count/count_test.go
index 785264c7f1c061f6d53baf2a23790550e531ecb4..62302d12fc92121e91ee1259a854b6a367cb67b2 100644
--- a/filter/count/count_test.go
+++ b/filter/count/count_test.go
@@ -52,7 +52,6 @@ func TestCount(t *testing.T) {
 
 		Convey("Calling a ds function should reflect in counter", func() {
 			So(ds.PutMulti(vals), ShouldBeNil)
-			So(ctr.NewKey.Successes(), ShouldEqual, 1)
 			So(ctr.PutMulti.Successes(), ShouldEqual, 1)
 
 			Convey("effects are cumulative", func() {
@@ -154,9 +153,7 @@ func ExampleFilterRDS() {
 	someCalledFunc(c)
 
 	// Then we can see what happened!
-	fmt.Printf("%s\n", counter.NewKey.String())
 	fmt.Printf("%d\n", counter.PutMulti.Successes())
 	// Output:
-	// {Successes:2, Errors:0}
 	// 2
 }