more test fixes
Merge pull request #1484 from kurund/text-fixes

more test fixes