Another round of test fixes