Minor adjustments to testing suite.