a bunch of test fixes (bug 878323)