Fixing some tests
Merge branch 'dev' into ms