Add empty value test. Be consistent about handling of empty values.