Fix some test failures