This is trying to strike a balance between updating as much existing classes as possible, but not making the diff too big...
Also added a very basic test for feed parsing.