[#59] Some more fixes to let mupjnl/gtm5007 subtest pass for -triggers case
[#59] Some more fixes to let mupjnl/gtm5007 subtest pass for -triggers case

nars1/YottaDBtest,nars1/YottaDBtest,nars1/YottaDBtest,nars1/YottaDBtest,nars1/YottaDBtest,nars1/YottaDBtest