Fixing some issues with tests and schema metadata
Scalastyle