directory structure woes, updated tests