Add feature specs and use them where appropriate