first steps to enable the tests run from command line build
Merge remote-tracking branch 'origin/master'