Fixes for test suite.