fix tests
Merge origin/master