Yet more live test fixes