Added base class to some tests