Clean up feeds and improve test coverage