Fix broken tests
Fix several issues with feed submissions