Another round of test fixes from previous commits