various test fixes
StrTPL: fixed string expansion