Addes status validations and tests