another merge error fix
timezone test; NetworkProviderFactory added again