Fix all remaining unit tests to remove all test failures; it's all green now.