Replaced remaining occurrences of Feed_ classes, updated tests