Merge "Tidy up our tests" into main