tests update
Merge origin/master