testsuite fixes and minor enhancements