Fix frame name
Fix tests