Fixing has..Rules methods to check for has..Validator
Reordering