test fixes
Merge pull request #1389 from kurund/merge-fixes

test fixes