Re-added missing directories in test templates