Addressing other test failures.