WIP: fix tests to account for the latest changes.
WIP: fix tests to account for the latest changes.

jmwenda/feedbunch,jmwenda/feedbunch,jmwenda/feedbunch,amatriain/feedbunch,amatriain/feedbunch,amatriain/feedbunch,amatriain/feedbunch