Added directory manager unit testing
Merge branch 'feature/DirectoryManagerTest' into develop