addressing comments and reconciling org factory tests