Better testing
Merge branch 'dev' into ms