Refactor status tests