Fix tests to use UUID strings rather than ints for IDs

Several tests were using ints rather than strings for IDs. The ints
were changed to UUID strings.

Change-Id: I65312509c72078c08ca284e313104e926d9885ba
Merge "Fix tests to use UUID strings rather than ints for IDs"