Separate the testdata from the datastore implementation
Datastore client tests
Construct a new Passport instance rather than using the singleton