Resolve statuses
Add spec