update test/ directory structure