reorganize testing infrastructure