Merge branch 'dev' into test&fix
fixes models tests
resume <fix test>
Merge branch 'dev' into test&fix
test fixes
Merge pull request #123 from is-valid/test&fix

Test&fix