Don't validate when there's no value to validate
More tests, some of which are failing