Fix extensions loss
Fix tests