Refactor the structure of test directory