Updated test to use flat directory structure.