Add validations and test files