Adds forgotten class.

Refs #120
Refactors tests to make them re-use existing tests.

Refs #120