Rework schema tests to not rely on schema text
Dependency upgrades