Fix miscellaneous prod bugs.

service/datastore/datastore_test.go

Index: service/datastore/datastore_test.go
diff --git a/service/datastore/datastore_test.go b/service/datastore/datastore_test.go
index f480e59963543a1b04559f0686c705ec00a46744..a9f38f11ce4294d140d427ed3373f9bfa3644bca 100644
--- a/service/datastore/datastore_test.go
+++ b/service/datastore/datastore_test.go
@@ -19,7 +19,7 @@ import (
 func fakeDatastoreFactory(c context.Context) RawInterface {
 	i := info.Get(c)
 	return &fakeDatastore{
-		aid: i.AppID(),
+		aid: i.FullyQualifiedAppID(),
 		ns:  i.GetNamespace(),
 	}
 }
@@ -552,8 +552,8 @@ func TestDelete(t *testing.T) {
 		Convey("bad", func() {
 			Convey("get single error for RPC failure", func() {
 				keys := []Key{
-					mkKey("aid", "ns", "FailAll", 1, nil),
-					mkKey("aid", "ns", "Ok", 1, nil),
+					mkKey("s~aid", "ns", "FailAll", 1, nil),
+					mkKey("s~aid", "ns", "Ok", 1, nil),
 				}
 				So(ds.DeleteMulti(keys).Error(), ShouldEqual, "DeleteMulti fail all")
 			})