Changes to run schema-aware tests