Another round of test fixes and merge conflicts