[Matahari] [PATCH] - Update tests to work with uuid changes to host