Fixed some test suites.