#8018 Handle case of empty value.
 Adapt test vocabulary and tests.