change directory names and add tests