Directory cleanups and fix test
Merge branch 'develop'