split dirs and add test