more test fixes
Merge pull request #2660 from kurund/test-fixes

more test fixes