Install ERD tools
Merge branch 'master'
refactor model tests