Progress towards getting more query tests running.
Use version properties everywhere, define them only in parent.