Added model tests and initial validations