Add status tests and validations