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 550c8795f90abe2e30248a849016fc49119d0bfd..12e7911c0341547d6fbc1b22fb622b19dcbbccf2 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] = mkKey("aid", "ns", "Kind", 1)
+			keys[0] = mkKey("s~aid", "ns", "Kind", 1)
 			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{mkKey("aid", "ns", "Kind", 0)}
+			keys = []Key{mkKey("s~aid", "ns", "Kind", 0)}
 			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{mkKey("aid", "ns", "Kind", 1)}, func(error) {
+				rds.DeleteMulti([]Key{mkKey("s~aid", "ns", "Kind", 1)}, func(error) {
 					hit = true
 				})
 			}, ShouldPanic)