Add validations and tests to the models