reorganize testcases