Enhance testing functionality
Merge pull request #166 from tuxedio/test-enhance

Enhance testing functionality