Modify tests for new-style schema.validate