moving test to last version
Fixing extends generation
tests upgrade