Fixed some dependency issues in the test suites.