Added test case support