Change header.
Moved tests from subclass to superclass for generic testing of generic code.