some live tests fixes