Fix miscellaneous prod bugs.

service/datastore/checkfilter_test.go

Index: service/datastore/checkfilter_test.go
diff --git a/service/datastore/checkfilter_test.go b/service/datastore/checkfilter_test.go
index 445b9d0aec03e0c7dc6bf5361fe1cc4a27d2a6f9..8428de5f2355fcaabeb278e32752034ec6ee9b64 100644
--- a/service/datastore/checkfilter_test.go
+++ b/service/datastore/checkfilter_test.go
@@ -68,7 +68,7 @@ func TestCheckFilter(t *testing.T) {
 				So(err, ShouldEqual, ErrInvalidKey)
 			}), ShouldBeNil)
 
-			keys[0] = NewKey("aid", "ns", "Kind", "", 1, nil)
+			keys[0] = NewKey("s~aid", "ns", "Kind", "", 1, nil)
 			hit := false
 			So(func() {
 				rds.GetMulti(keys, nil, func(pm PropertyMap, err error) {
@@ -94,7 +94,7 @@ func TestCheckFilter(t *testing.T) {
 				So(err, ShouldEqual, ErrInvalidKey)
 			}), ShouldBeNil)
 
-			keys = []Key{NewKey("aid", "ns", "Kind", "", 0, nil)}
+			keys = []Key{NewKey("s~aid", "ns", "Kind", "", 0, nil)}
 			vals = []PropertyMap{nil}
 			So(rds.PutMulti(keys, vals, func(k Key, err error) {
 				So(k, ShouldBeNil)
@@ -120,7 +120,7 @@ func TestCheckFilter(t *testing.T) {
 
 			hit := false
 			So(func() {
-				rds.DeleteMulti([]Key{NewKey("aid", "ns", "Kind", "", 1, nil)}, func(error) {
+				rds.DeleteMulti([]Key{NewKey("s~aid", "ns", "Kind", "", 1, nil)}, func(error) {
 					hit = true
 				})
 			}, ShouldPanic)