Refactor tests
Add ValidationError