reorganize testing