More UT cleanup
Fix live test bugs - TTLs and argument nam,es