a bit of work on bug 760876 test fixes