Add more testing and validation to improve error messages
Start refactoring feed manager
Improve test so it actually verifies functionality