Minor changes to the 2 test classes

Changed a few names in EquipmentMonitor and Feeder classes to make the
code slightly easier to read.