client-controller integration test, adding UUID where missing