Tidy up
Tidy up
Upgrade API
Add tests for feed item: invalid ID and not found