Added feature tests/validations in models