Test directory structure refactored.