Even more live test fixes