Fix several unit test issues.
Fix more unit test problems.