Yi-do refactoring to re-organize the test sample