Fix remaining test failures