tests fixed
Merge branch 'Fix-tests'