More live test fixes