Refactor test directories