Make the validation hypens unsensible and add correlated tests