Re-working validation examples