reorganize test class