#50 update tests and step_object with new equipment organization