Add validations and valid test data