Add tests to ensure thta UUID is preferred, Fix titles