Restored part of test suite.