Small testsuite refactoring; no functional change