increase test coverage, case of null -> Option[UUID]