More attempted test fixes