Update for test suite.