Refactored takeaway spec in contexts