Reorganising and completing the tests for the base class.