Fix test broken dependencies, new org creation