Fix org recreate test