fix tests and wrong usage of allowEmpty+emptyValue