Using random ids for keys of entities on datastore tests and code cleanu...

...p.