add test and move directories