restructure test cases