Partially fixed test suite.