Add more validation on statuses with tests