Validations and tests corrected