Revised tests for equipment.

Revised to make use of a factory.