Simplify testcase
Restructure test-case
More useful testcase