added how to run tests
Merge branch 'dev'