Fix test directory structure