Added validations & tests.