refactor tests dirs