Tidy up test migration and fix Gradle 9 test compatibility#1630

FinlayRJW wants to merge 21 commits intodeveloppalantir/gradle-consistent-versions:developfrom

finlayw/tidy-uppalantir/gradle-consistent-versions:finlayw/tidy-upCopy head branch name to clipboard