More live test fixes
Live test fixes