more test fixes for bug 760876