some more test fixes