more work on fixing tests for bug 760876