Tidy up
Use tap, remove given, set real expectations for feed API
Tidy up
Tidy up