Removed "INCLUDE_OPTIONAL" constant in tests.py
Separated "format" validation into its own class