more tests and Model validations