Add basic tests
Add validations
Remove 'add tests' from todo