Added directory tests
Merge branch 'master' of github.com:bluemellophone/modules