- adjusting tests
- first build ok!
Merge origin/master