Changed after generation
Refactored tests