refactor test directory structure