Test updates for new directory structure