enhance Enhanced testcase
Merge pull request #884 from boegel/enhance_enhancedtestcase

enhance Enhanced testcase