Fixing of tests
Merge origin/master