Base class fixes to classes and tests