Working to resolve test failures.