Add tests
Add test, validators, cli and models