First round of test fixes