more tests and clean up the feed server slightly.