Fix all remaining test failures