rearranged test modules