+ Refactoring of test classes to .base packages