Decorate objects passed to feed generator
Fix awkward pluralization
Update after test factory hook name