Fixed to errors resulting from the reworking of the template classes and not rerunning the Unittests of the inheriting classes. :P