More live test bug fixes