Prepare new types of units
Refactoring test