tests fixed
Merge branch 'dev'