Move test into src/test/java
Fix more XSD declarations