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

more test fixes