more testsuite code