Merge "Add uuid for tests"