* reorganise test and class.