Running test suite and fixing model bugs
Merge branch 'master' of https://github.com/Etiene/sailor