Split base class into smaller pieces (Part 1)
Fixed test
Extracted setter/s generation
Removed setters/getters method