diff --git a/UnitTests/TestMobileProvisionIndex.cs b/UnitTests/TestMobileProvisionIndex.cs
index 2f07e13..18c4a0a 100644
--- a/UnitTests/TestMobileProvisionIndex.cs
+++ b/UnitTests/TestMobileProvisionIndex.cs
@@ -42,33 +42,38 @@ public void TestCreateIndex ()
 
 			Assert.AreEqual (2, index.ProvisioningProfiles.Count);
 
-			Assert.AreEqual ("YHT9CR87YA.com.companyname.*", index.ProvisioningProfiles[0].ApplicationIdentifier);
-			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[0].CreationDate);
-			Assert.AreEqual (1, index.ProvisioningProfiles[0].DeveloperCertificates.Count);
-			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[0].DeveloperCertificates[0].Name);
-			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[0].DeveloperCertificates[0].Thumbprint);
-			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[0].Distribution);
-			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[0].ExpirationDate);
-			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[0].FileName));
+			var idCompanyName = index.ProvisioningProfiles.FindIndex ((v) => v.ApplicationIdentifier.Contains ("companyname"));
+			var idXamarin = index.ProvisioningProfiles.FindIndex ((v) => v.ApplicationIdentifier.Contains ("xamarin"));
+			Assert.AreNotEqual (-1, idCompanyName, "Company Name Index");
+			Assert.AreNotEqual (-1, idXamarin, "Xamarin Index");
+			Assert.AreNotEqual (idXamarin, idCompanyName, "Indices");
+			Assert.AreEqual ("YHT9CR87YA.com.companyname.*", index.ProvisioningProfiles[idCompanyName].ApplicationIdentifier);
+			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[idCompanyName].CreationDate);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idCompanyName].DeveloperCertificates.Count);
+			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[idCompanyName].DeveloperCertificates[0].Name);
+			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[idCompanyName].DeveloperCertificates[0].Thumbprint);
+			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[idCompanyName].Distribution);
+			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[idCompanyName].ExpirationDate);
+			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[idCompanyName].FileName));
 			//Assert.AreEqual (index.ProvisioningProfiles[0].LastModified);
-			Assert.AreEqual ("CompanyName Development Profile", index.ProvisioningProfiles[0].Name);
+			Assert.AreEqual ("CompanyName Development Profile", index.ProvisioningProfiles[idCompanyName].Name);
 			Assert.AreEqual (1, index.ProvisioningProfiles[0].Platforms.Count);
-			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[0].Platforms[0]);
-			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e", index.ProvisioningProfiles[0].Uuid);
+			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[idCompanyName].Platforms[0]);
+			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e", index.ProvisioningProfiles[idCompanyName].Uuid);
 
-			Assert.AreEqual ("YHT9CR87YA.com.xamarin.*", index.ProvisioningProfiles[1].ApplicationIdentifier);
-			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[1].CreationDate);
-			Assert.AreEqual (1, index.ProvisioningProfiles[1].DeveloperCertificates.Count);
-			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[1].DeveloperCertificates[0].Name);
-			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[1].DeveloperCertificates[0].Thumbprint);
-			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[1].Distribution);
-			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[1].ExpirationDate);
-			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[1].FileName));
+			Assert.AreEqual ("YHT9CR87YA.com.xamarin.*", index.ProvisioningProfiles[idXamarin].ApplicationIdentifier);
+			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[idXamarin].CreationDate);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idXamarin].DeveloperCertificates.Count);
+			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[idXamarin].DeveloperCertificates[0].Name);
+			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[idXamarin].DeveloperCertificates[0].Thumbprint);
+			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[idXamarin].Distribution);
+			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[idXamarin].ExpirationDate);
+			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[idXamarin].FileName));
 			//Assert.AreEqual (index.ProvisioningProfiles[0].LastModified);
-			Assert.AreEqual ("Xamarin Development Profile", index.ProvisioningProfiles[1].Name);
-			Assert.AreEqual (1, index.ProvisioningProfiles[1].Platforms.Count);
-			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[1].Platforms[0]);
-			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616", index.ProvisioningProfiles[1].Uuid);
+			Assert.AreEqual ("Xamarin Development Profile", index.ProvisioningProfiles[idXamarin].Name);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idXamarin].Platforms.Count);
+			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[idXamarin].Platforms[0]);
+			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616", index.ProvisioningProfiles[idXamarin].Uuid);
 		}
 
 		[Test]
@@ -78,33 +83,38 @@ public void TestOpenIndex ()
 
 			Assert.AreEqual (2, index.ProvisioningProfiles.Count);
 
-			Assert.AreEqual ("YHT9CR87YA.com.companyname.*", index.ProvisioningProfiles[0].ApplicationIdentifier);
-			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[0].CreationDate);
-			Assert.AreEqual (1, index.ProvisioningProfiles[0].DeveloperCertificates.Count);
-			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[0].DeveloperCertificates[0].Name);
-			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[0].DeveloperCertificates[0].Thumbprint);
-			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[0].Distribution);
-			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[0].ExpirationDate);
-			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[0].FileName));
+			var idCompanyName = index.ProvisioningProfiles.FindIndex ((v) => v.ApplicationIdentifier.Contains ("companyname"));
+			var idXamarin = index.ProvisioningProfiles.FindIndex ((v) => v.ApplicationIdentifier.Contains ("xamarin"));
+			Assert.AreNotEqual (-1, idCompanyName, "Company Name Index");
+			Assert.AreNotEqual (-1, idXamarin, "Xamarin Index");
+			Assert.AreNotEqual (idXamarin, idCompanyName, "Indices");
+			Assert.AreEqual ("YHT9CR87YA.com.companyname.*", index.ProvisioningProfiles[idCompanyName].ApplicationIdentifier);
+			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[idCompanyName].CreationDate);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idCompanyName].DeveloperCertificates.Count);
+			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[idCompanyName].DeveloperCertificates[0].Name);
+			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[idCompanyName].DeveloperCertificates[0].Thumbprint);
+			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[idCompanyName].Distribution);
+			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 43, 45, DateTimeKind.Utc), index.ProvisioningProfiles[idCompanyName].ExpirationDate);
+			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[idCompanyName].FileName));
 			//Assert.AreEqual (index.ProvisioningProfiles[0].LastModified);
-			Assert.AreEqual ("CompanyName Development Profile", index.ProvisioningProfiles[0].Name);
-			Assert.AreEqual (1, index.ProvisioningProfiles[0].Platforms.Count);
-			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[0].Platforms[0]);
-			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e", index.ProvisioningProfiles[0].Uuid);
+			Assert.AreEqual ("CompanyName Development Profile", index.ProvisioningProfiles[idCompanyName].Name);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idCompanyName].Platforms.Count);
+			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[idCompanyName].Platforms[0]);
+			Assert.AreEqual ("29cbf4b4-a170-4c74-a29a-64ecd55b102e", index.ProvisioningProfiles[idCompanyName].Uuid);
 
-			Assert.AreEqual ("YHT9CR87YA.com.xamarin.*", index.ProvisioningProfiles[1].ApplicationIdentifier);
-			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[1].CreationDate);
-			Assert.AreEqual (1, index.ProvisioningProfiles[1].DeveloperCertificates.Count);
-			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[1].DeveloperCertificates[0].Name);
-			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[1].DeveloperCertificates[0].Thumbprint);
-			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[1].Distribution);
-			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[1].ExpirationDate);
-			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[1].FileName));
+			Assert.AreEqual ("YHT9CR87YA.com.xamarin.*", index.ProvisioningProfiles[idXamarin].ApplicationIdentifier);
+			Assert.AreEqual (new DateTime (2017, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[idXamarin].CreationDate);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idXamarin].DeveloperCertificates.Count);
+			Assert.AreEqual ("iPhone Developer: Jeffrey Stedfast (FZ77UAV9SW)", index.ProvisioningProfiles[idXamarin].DeveloperCertificates[0].Name);
+			Assert.AreEqual ("2097D37F4D16AB7D8D927E7C1872F2A94D8DC718", index.ProvisioningProfiles[idXamarin].DeveloperCertificates[0].Thumbprint);
+			Assert.AreEqual (MobileProvisionDistributionType.Development, index.ProvisioningProfiles[idXamarin].Distribution);
+			Assert.AreEqual (new DateTime (2018, 07, 19, 19, 44, 0, DateTimeKind.Utc), index.ProvisioningProfiles[idXamarin].ExpirationDate);
+			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616.mobileprovision", Path.GetFileName (index.ProvisioningProfiles[idXamarin].FileName));
 			//Assert.AreEqual (index.ProvisioningProfiles[0].LastModified);
-			Assert.AreEqual ("Xamarin Development Profile", index.ProvisioningProfiles[1].Name);
-			Assert.AreEqual (1, index.ProvisioningProfiles[1].Platforms.Count);
-			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[1].Platforms[0]);
-			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616", index.ProvisioningProfiles[1].Uuid);
+			Assert.AreEqual ("Xamarin Development Profile", index.ProvisioningProfiles[idXamarin].Name);
+			Assert.AreEqual (1, index.ProvisioningProfiles[idXamarin].Platforms.Count);
+			Assert.AreEqual (MobileProvisionPlatform.iOS, index.ProvisioningProfiles[idXamarin].Platforms[0]);
+			Assert.AreEqual ("7079f389-6ff4-4290-bf76-c8a222947616", index.ProvisioningProfiles[idXamarin].Uuid);
 		}
 	}
 }