restructure of test cases