Added test directory structure