rearranged test modules
fixed builds