Improved default_labels and org_name logic
Up(down)graded tests to reflect new logic