New base class names & test run