Complete unit tests
Add validations to models