Fixes feeder test code and controls