Add status validations and tests2