Add more tests
Add validators
Add validators and tests