Account for all cases of empty values fixing a broken test (LEV-155)