preparations for unit-testing
Merge branch 'dev'