more test fixes for bug 843004