Fix split test unit test failures.