Improve test coverage
Add some missing validations
Improve test coverage