cleanup / fixes
Merge pull request #2668 from kurund/test-fixes

cleanup / fixes