refactor test dir