Minor updates to testing suite.