fix dependencies / test includes / mod includes
Merge pull request #1 from petermd/fix-tests

fix dependencies / test includes / mod includes