rearrange TestGenerator