Ran tests and added validations