changed the order of the validation tests