More test suite enhancements
Merge pull request #168 from tuxedio/test-enhance

More test suite enhancements