Fix unresolved tests in testsuite.