Tests fix
Merge origin/master