Refactoring: more tests use base class features.