Refactor tests on models (mostly model validation)