Added tests and validations.