| Index: service/datastore/query_test.go
 | 
| diff --git a/service/datastore/query_test.go b/service/datastore/query_test.go
 | 
| index 9e16edc97d559b442d2894bdc0a9e853bb753680..366ab8b63d901e68c6e0b3fd7e901a97863701db 100644
 | 
| --- a/service/datastore/query_test.go
 | 
| +++ b/service/datastore/query_test.go
 | 
| @@ -82,7 +82,7 @@ func nq(kinds ...string) *Query {
 | 
|  }
 | 
|  
 | 
|  func mkKey(elems ...interface{}) *Key {
 | 
| -	return MakeKey("s~aid", "ns", elems...)
 | 
| +	return KeyContext{"s~aid", "ns"}.MakeKey(elems...)
 | 
|  }
 | 
|  
 | 
|  var queryTests = []queryTest{
 | 
| @@ -321,7 +321,7 @@ func TestQueries(t *testing.T) {
 | 
|  			Convey(tc.name, func() {
 | 
|  				fq, err := tc.q.Finalize()
 | 
|  				if err == nil {
 | 
| -					err = fq.Valid("s~aid", "ns")
 | 
| +					err = fq.Valid(KeyContext{"s~aid", "ns"})
 | 
|  				}
 | 
|  				So(err, ShouldErrLike, tc.err)
 | 
|  
 | 
| 
 |