Tests fixed for #gt-25 Fixed work 2h
Merge remote-tracking branch 'origin/master'