More live test fixes
Merge remote-tracking branch 'remotes/origin/dev_new_homestead_api' into dev_new_homestead_api