add and rearrange testsuite items