Fix many tests and revert schematron work until we get the official version from develop