New way to include some file into unit tests
Merge branch 'develop'