Some tests fixes
Merge origin/master