various minor changes to use the latest version of the test framework

As subject says. No other changes.