More changes after feedback

- Fixed indentation
- Simplified hasValidatorAnnotation method
- Deleted test that was covered elsewhere