Enhancement: Validation Testing

- Adds more complete testing of the validation rules