[wip] testcase refactor