Unit Testing: Added extra parameter to AddAccount to CDS tests

[xestiacalendar/.git] / source / tests / xestiacalendar_calendardatastorage.h

diff --git a/source/tests/xestiacalendar_calendardatastorage.h b/source/tests/xestiacalendar_calendardatastorage.h
index c75ca72..a71151e 100644 (file)
--- a/source/tests/xestiacalendar_calendardatastorage.h
+++ b/source/tests/xestiacalendar_calendardatastorage.h
@@ -32,7 +32,7 @@ TEST(CalendarDataStorage, Add_One_Account){
        
        CalendarDataStorage AddOneEntryTest;
        
-       ASSERT_EQ(CDSACCOUNT_OK, AddOneEntryTest.AddAccount("Test Account 1"));
+       ASSERT_EQ(CDSACCOUNT_OK, AddOneEntryTest.AddAccount("Test Account 1", 1));
        
 }
 
@@ -40,8 +40,8 @@ TEST(CalendarDataStorage, Add_Two_Accounts){
        
        CalendarDataStorage AddTwoEntryTest;
 
-       ASSERT_EQ(CDSACCOUNT_OK, AddTwoEntryTest.AddAccount("Test Account 1"));
-       ASSERT_EQ(CDSACCOUNT_OK, AddTwoEntryTest.AddAccount("Test Account 2"));
+       ASSERT_EQ(CDSACCOUNT_OK, AddTwoEntryTest.AddAccount("Test Account 1", 1));
+       ASSERT_EQ(CDSACCOUNT_OK, AddTwoEntryTest.AddAccount("Test Account 2", 2));
        
 }
 
@@ -49,9 +49,9 @@ TEST(CalendarDataStorage, Add_Three_Accounts){
        
        CalendarDataStorage AddThreeEntryTest;
        
-       ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 1"));
-       ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 2"));
-       ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 3"));
+       ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 1", 1));
+       ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 2", 2));
+       ASSERT_EQ(CDSACCOUNT_OK, AddThreeEntryTest.AddAccount("Test Account 3", 3));
        
 }
 
@@ -59,7 +59,7 @@ TEST(CalendarDataStorage, Get_Account_Information){
        
        CalendarDataStorage AccountInformationTest;
        
-       AccountInformationTest.AddAccount("Test Account 1");
+       AccountInformationTest.AddAccount("Test Account 1", 1);
        ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 1").accountInfoResult);
        ASSERT_EQ("Test Account 1", AccountInformationTest.GetAccount("Test Account 1").accountName);
        ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountID);
@@ -70,16 +70,18 @@ TEST(CalendarDataStorage, Get_Two_Accounts_Information){
        
        CalendarDataStorage AccountInformationTest;
        
-       AccountInformationTest.AddAccount("Test Account 1");
-       AccountInformationTest.AddAccount("Test Account 2");
+       AccountInformationTest.AddAccount("Test Account 1", 1);
+       AccountInformationTest.AddAccount("Test Account 2", 2);
        
        ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 1").accountInfoResult);
        ASSERT_EQ("Test Account 1", AccountInformationTest.GetAccount("Test Account 1").accountName);
        ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountID);
+       ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountPreferencesID);
 
        ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 2").accountInfoResult);
        ASSERT_EQ("Test Account 2", AccountInformationTest.GetAccount("Test Account 2").accountName);
        ASSERT_EQ(2, AccountInformationTest.GetAccount("Test Account 2").accountID);
+       ASSERT_EQ(2, AccountInformationTest.GetAccount("Test Account 2").accountPreferencesID);
        
 }
 
@@ -87,21 +89,24 @@ TEST(CalendarDataStorage, Get_Three_Accounts_Information){
        
        CalendarDataStorage AccountInformationTest;
        
-       AccountInformationTest.AddAccount("Test Account 1");
-       AccountInformationTest.AddAccount("Test Account 2");
-       AccountInformationTest.AddAccount("Test Account 3");
+       AccountInformationTest.AddAccount("Test Account 1", 1);
+       AccountInformationTest.AddAccount("Test Account 2", 2);
+       AccountInformationTest.AddAccount("Test Account 3", 3);
        
        ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 1").accountInfoResult);
        ASSERT_EQ("Test Account 1", AccountInformationTest.GetAccount("Test Account 1").accountName);
        ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountID);
+       ASSERT_EQ(1, AccountInformationTest.GetAccount("Test Account 1").accountPreferencesID);
 
        ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 2").accountInfoResult);
        ASSERT_EQ("Test Account 2", AccountInformationTest.GetAccount("Test Account 2").accountName);
        ASSERT_EQ(2, AccountInformationTest.GetAccount("Test Account 2").accountID);
+       ASSERT_EQ(2, AccountInformationTest.GetAccount("Test Account 2").accountPreferencesID);
 
        ASSERT_EQ(CDSACCOUNT_OK, AccountInformationTest.GetAccount("Test Account 3").accountInfoResult);
        ASSERT_EQ("Test Account 3", AccountInformationTest.GetAccount("Test Account 3").accountName);
        ASSERT_EQ(3, AccountInformationTest.GetAccount("Test Account 3").accountID);
+       ASSERT_EQ(3, AccountInformationTest.GetAccount("Test Account 3").accountPreferencesID);
        
 }
 
@@ -109,7 +114,7 @@ TEST(CalendarDataStorage, Get_List_Of_One_Account){
        
        CalendarDataStorage AccountInformationTest;
        
-       AccountInformationTest.AddAccount("Test Account 1");
+       AccountInformationTest.AddAccount("Test Account 1", 1);
        
        CDSAccountList accountListData = AccountInformationTest.GetAccountList();
        
@@ -119,6 +124,7 @@ TEST(CalendarDataStorage, Get_List_Of_One_Account){
        ASSERT_EQ(1, accountListData.accountList[0].accountID); 
        ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[0].accountInfoResult);
        ASSERT_EQ("Test Account 1", accountListData.accountList[0].accountName);
+       ASSERT_EQ(1, accountListData.accountList[0].accountPreferencesID);
        
 }
 
@@ -126,8 +132,8 @@ TEST(CalendarDataStorage, Get_List_Of_Two_Accounts){
        
        CalendarDataStorage AccountInformationTest;
        
-       AccountInformationTest.AddAccount("Test Account 1");
-       AccountInformationTest.AddAccount("Test Account 2");
+       AccountInformationTest.AddAccount("Test Account 1", 1);
+       AccountInformationTest.AddAccount("Test Account 2", 2);
        
        CDSAccountList accountListData = AccountInformationTest.GetAccountList();
        
@@ -137,10 +143,12 @@ TEST(CalendarDataStorage, Get_List_Of_Two_Accounts){
        ASSERT_EQ(1, accountListData.accountList[0].accountID); 
        ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[0].accountInfoResult);
        ASSERT_EQ("Test Account 1", accountListData.accountList[0].accountName);
+       ASSERT_EQ(1, accountListData.accountList[0].accountPreferencesID);
 
        ASSERT_EQ(2, accountListData.accountList[1].accountID);
        ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[1].accountInfoResult);
        ASSERT_EQ("Test Account 2", accountListData.accountList[1].accountName);
+       ASSERT_EQ(2, accountListData.accountList[1].accountPreferencesID);
        
 }
 
@@ -148,9 +156,9 @@ TEST(CalendarDataStorage, Get_List_Of_Three_Accounts){
        
        CalendarDataStorage AccountInformationTest;
        
-       AccountInformationTest.AddAccount("Test Account 1");
-       AccountInformationTest.AddAccount("Test Account 2");
-       AccountInformationTest.AddAccount("Test Account 3");
+       AccountInformationTest.AddAccount("Test Account 1", 1);
+       AccountInformationTest.AddAccount("Test Account 2", 2);
+       AccountInformationTest.AddAccount("Test Account 3", 3);
        
        CDSAccountList accountListData = AccountInformationTest.GetAccountList();
        
@@ -160,14 +168,17 @@ TEST(CalendarDataStorage, Get_List_Of_Three_Accounts){
        ASSERT_EQ(1, accountListData.accountList[0].accountID); 
        ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[0].accountInfoResult);
        ASSERT_EQ("Test Account 1", accountListData.accountList[0].accountName);
+       ASSERT_EQ(1, accountListData.accountList[0].accountPreferencesID);
 
        ASSERT_EQ(2, accountListData.accountList[1].accountID);
        ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[1].accountInfoResult);
        ASSERT_EQ("Test Account 2", accountListData.accountList[1].accountName);
+       ASSERT_EQ(2, accountListData.accountList[1].accountPreferencesID);
 
        ASSERT_EQ(3, accountListData.accountList[2].accountID);
        ASSERT_EQ(CDSACCOUNT_OK, accountListData.accountList[2].accountInfoResult);
        ASSERT_EQ("Test Account 3", accountListData.accountList[2].accountName);
+       ASSERT_EQ(3, accountListData.accountList[2].accountPreferencesID);
 
 }
 
@@ -175,7 +186,7 @@ TEST(CalendarDataStorage, Update_One_Account){
        
        CalendarDataStorage UpdateAccountTest;
        
-       UpdateAccountTest.AddAccount("Test Account 1");
+       UpdateAccountTest.AddAccount("Test Account 1", 1);
        
        int testAccount1ID = UpdateAccountTest.GetAccount("Test Account 1").accountID;
        
@@ -190,8 +201,8 @@ TEST(CalendarDataStorage, Update_Two_Accounts){
        
        CalendarDataStorage UpdateAccountTest;
        
-       UpdateAccountTest.AddAccount("Test Account 1");
-       UpdateAccountTest.AddAccount("Test Account 2");
+       UpdateAccountTest.AddAccount("Test Account 1", 1);
+       UpdateAccountTest.AddAccount("Test Account 2", 2);
        
        int testAccount1ID = UpdateAccountTest.GetAccount("Test Account 1").accountID;
        int testAccount2ID = UpdateAccountTest.GetAccount("Test Account 2").accountID;
@@ -214,9 +225,9 @@ TEST(CalendarDataStorage, Update_Three_Accounts){
        
        CalendarDataStorage UpdateAccountTest;
        
-       UpdateAccountTest.AddAccount("Test Account 1");
-       UpdateAccountTest.AddAccount("Test Account 2");
-       UpdateAccountTest.AddAccount("Test Account 3");
+       UpdateAccountTest.AddAccount("Test Account 1", 1);
+       UpdateAccountTest.AddAccount("Test Account 2", 2);
+       UpdateAccountTest.AddAccount("Test Account 3", 3);
        
        int testAccount1ID = UpdateAccountTest.GetAccount("Test Account 1").accountID;
        int testAccount2ID = UpdateAccountTest.GetAccount("Test Account 2").accountID;
@@ -245,7 +256,7 @@ TEST(CalendarDataStorage, Delete_One_Account){
        
        CalendarDataStorage DeleteAccountTest;
        
-       DeleteAccountTest.AddAccount("Test Account 1");
+       DeleteAccountTest.AddAccount("Test Account 1", 1);
        
        ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 1").accountID));
        
@@ -255,8 +266,8 @@ TEST(CalendarDataStorage, Delete_Two_Accounts){
        
        CalendarDataStorage DeleteAccountTest;
        
-       DeleteAccountTest.AddAccount("Test Account 1");
-       DeleteAccountTest.AddAccount("Test Account 2");
+       DeleteAccountTest.AddAccount("Test Account 1", 1);
+       DeleteAccountTest.AddAccount("Test Account 2", 2);
        
        ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 1").accountID));
        ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 2").accountID));
@@ -267,9 +278,9 @@ TEST(CalendarDataStorage, Delete_Three_Accounts){
        
        CalendarDataStorage DeleteAccountTest;
        
-       DeleteAccountTest.AddAccount("Test Account 1");
-       DeleteAccountTest.AddAccount("Test Account 2");
-       DeleteAccountTest.AddAccount("Test Account 3");
+       DeleteAccountTest.AddAccount("Test Account 1", 1);
+       DeleteAccountTest.AddAccount("Test Account 2", 2);
+       DeleteAccountTest.AddAccount("Test Account 3", 3);
        
        ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 1").accountID));
        ASSERT_EQ(CDSACCOUNT_OK, DeleteAccountTest.DeleteAccount(DeleteAccountTest.GetAccount("Test Account 2").accountID));
@@ -281,9 +292,9 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_One_Account){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -291,10 +302,10 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_One_Account){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -302,11 +313,11 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_One_Account){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -314,12 +325,12 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_Two_Accounts){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
-       AddCalendarTest.AddAccount("Test Account 2");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
+       AddCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -327,14 +338,14 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_Two_Accounts){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
-       AddCalendarTest.AddAccount("Test Account 2");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
+       AddCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -342,16 +353,16 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_Two_Accounts){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
-       AddCalendarTest.AddAccount("Test Account 2");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
+       AddCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -359,15 +370,15 @@ TEST(CalendarDataStorage, Add_One_Calendar_To_Three_Accounts){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
-       AddCalendarTest.AddAccount("Test Account 2");
-       AddCalendarTest.AddAccount("Test Account 3");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
+       AddCalendarTest.AddAccount("Test Account 2", 2);
+       AddCalendarTest.AddAccount("Test Account 3", 3);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -375,18 +386,18 @@ TEST(CalendarDataStorage, Add_Two_Calendars_To_Three_Accounts){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
-       AddCalendarTest.AddAccount("Test Account 2");
-       AddCalendarTest.AddAccount("Test Account 3");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
+       AddCalendarTest.AddAccount("Test Account 2", 2);
+       AddCalendarTest.AddAccount("Test Account 3", 3);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
        
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -394,21 +405,21 @@ TEST(CalendarDataStorage, Add_Three_Calendars_To_Three_Accounts){
        
        CalendarDataStorage AddCalendarTest;
        
-       AddCalendarTest.AddAccount("Test Account 1");
-       AddCalendarTest.AddAccount("Test Account 2");
-       AddCalendarTest.AddAccount("Test Account 3");
+       AddCalendarTest.AddAccount("Test Account 1", 1);
+       AddCalendarTest.AddAccount("Test Account 2", 2);
+       AddCalendarTest.AddAccount("Test Account 3", 3);
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description"));
+       ASSERT_EQ(CDSCALENDAR_OK, AddCalendarTest.AddCalendar(AddCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description"));
        
 }
 
@@ -416,11 +427,11 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){
        
        CalendarDataStorage GetCalendarTest;
        
-       GetCalendarTest.AddAccount("Test Account 1");   
+       GetCalendarTest.AddAccount("Test Account 1", 1);        
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 3"));
        
        CDSGetCalendarInfo calendar1Info;
        CDSGetCalendarInfo calendar2Info;
@@ -455,8 +466,12 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_One_Account){
        ASSERT_EQ("calendar3-test", calendar3Info.calendarTextID);
 
        ASSERT_EQ("Test Account 1", calendar1Info.accountName);
-       ASSERT_EQ("Test Account 1", calendar1Info.accountName);
-       ASSERT_EQ("Test Account 1", calendar1Info.accountName);
+       ASSERT_EQ("Test Account 1", calendar2Info.accountName);
+       ASSERT_EQ("Test Account 1", calendar3Info.accountName);
+       
+       ASSERT_EQ("Calendar Description 1", calendar1Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 2", calendar2Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 3", calendar3Info.calendarDescription);
 
 }
 
@@ -464,16 +479,16 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){
        
        CalendarDataStorage GetCalendarTest;
        
-       GetCalendarTest.AddAccount("Test Account 1");
-       GetCalendarTest.AddAccount("Test Account 2");
+       GetCalendarTest.AddAccount("Test Account 1", 1);
+       GetCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 3"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 4"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 5"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 6"));
        
        CDSGetCalendarInfo calendar1Info;
        CDSGetCalendarInfo calendar2Info;
@@ -547,27 +562,34 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Two_Accounts){
        ASSERT_EQ("Test Account 2", calendar5Info.accountName);
        ASSERT_EQ("Test Account 2", calendar6Info.accountName);
 
+       ASSERT_EQ("Calendar Description 1", calendar1Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 2", calendar2Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 3", calendar3Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 4", calendar4Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 5", calendar5Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 6", calendar6Info.calendarDescription);
+
 }
 
 TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){
        
        CalendarDataStorage GetCalendarTest;
        
-       GetCalendarTest.AddAccount("Test Account 1");
-       GetCalendarTest.AddAccount("Test Account 2");
-       GetCalendarTest.AddAccount("Test Account 3");
+       GetCalendarTest.AddAccount("Test Account 1", 1);
+       GetCalendarTest.AddAccount("Test Account 2", 2);
+       GetCalendarTest.AddAccount("Test Account 3", 3);
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 3"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 4"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 5"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 6"));
 
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 7"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 8"));
+       ASSERT_EQ(CDSCALENDAR_OK, GetCalendarTest.AddCalendar(GetCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 9"));
        
        CDSGetCalendarInfo calendar1Info;
        CDSGetCalendarInfo calendar2Info;
@@ -677,20 +699,33 @@ TEST(CalendarDataStorage, Get_Calendar_Information_From_Three_Accounts){
        ASSERT_EQ("Test Account 3", calendar8Info.accountName);
        ASSERT_EQ("Test Account 3", calendar9Info.accountName);
 
+       ASSERT_EQ("Calendar Description 1", calendar1Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 2", calendar2Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 3", calendar3Info.calendarDescription);
+
+       ASSERT_EQ("Calendar Description 4", calendar4Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 5", calendar5Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 6", calendar6Info.calendarDescription);
+
+       ASSERT_EQ("Calendar Description 7", calendar7Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 8", calendar8Info.calendarDescription);
+       ASSERT_EQ("Calendar Description 9", calendar9Info.calendarDescription);
+
 }
 
 TEST(CalendarDataStorage, Update_One_Calendar_With_One_Account){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
        
 }
 
@@ -698,20 +733,23 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_Two_Accounts){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
-       UpdateCalendarTest.AddAccount("Test Account 2");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
+       UpdateCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 2"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 2 Updated"));
        
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName);
+
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription);
        
 }
 
@@ -719,45 +757,52 @@ TEST(CalendarDataStorage, Update_One_Calendar_With_Three_Accounts){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
-       UpdateCalendarTest.AddAccount("Test Account 2");
-       UpdateCalendarTest.AddAccount("Test Account 3");        
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
+       UpdateCalendarTest.AddAccount("Test Account 2", 2);
+       UpdateCalendarTest.AddAccount("Test Account 3", 3);     
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour));    
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 3"));  
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test");
        CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 1 Updated"));   
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 3 Updated"));  
        
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName);       
        
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarDescription);
+       
 }
 
 TEST(CalendarDataStorage, Update_Two_Calendars_With_One_Account){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", DefaultColour, "Calendar Description 2 Updated"));
        
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName);
+
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription);
        
 }
 
@@ -765,45 +810,50 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Two_Accounts){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
-       UpdateCalendarTest.AddAccount("Test Account 2");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
+       UpdateCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 3"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", DefaultColour, "Calendar Description 4"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
        CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test");
        CDSGetCalendarInfo calendar4Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", DefaultColour, "Calendar Description 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", DefaultColour, "Calendar Description 3 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", DefaultColour, "Calendar Description 4 Updated"));
        
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName);
        ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName);
 
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription);
+
 }
 
 TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
-       UpdateCalendarTest.AddAccount("Test Account 2");
-       UpdateCalendarTest.AddAccount("Test Account 3");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
+       UpdateCalendarTest.AddAccount("Test Account 2", 2);
+       UpdateCalendarTest.AddAccount("Test Account 3", 3);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 5", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 6", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 3"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar2-test", DefaultColour, "Calendar Description 4"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 5", "calendar1-test", DefaultColour, "Calendar Description 5"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 6", "calendar2-test", DefaultColour, "Calendar Description 6"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -812,12 +862,12 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){
        CDSGetCalendarInfo calendar5Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test");
        CDSGetCalendarInfo calendar6Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", DefaultColour, "Calendar Description 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", DefaultColour, "Calendar Description 3 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", DefaultColour, "Calendar Description 4 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated", DefaultColour, "Calendar Description 5 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated", DefaultColour, "Calendar Description 6 Updated"));
 
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName);
@@ -826,6 +876,13 @@ TEST(CalendarDataStorage, Update_Two_Calendars_With_Three_Accounts){
        ASSERT_EQ("Calendar 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarName);
 
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarDescription);
+
 }
 
 
@@ -833,39 +890,43 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_One_Account){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 3"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
        CDSGetCalendarInfo calendar3Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test");  
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated"));   
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", DefaultColour, "Calendar Description 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", DefaultColour, "Calendar Description 3 Updated"));  
        
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName);
        ASSERT_EQ("Calendar 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarName);
-       
+
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarDescription);
+
 }
 
 TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
-       UpdateCalendarTest.AddAccount("Test Account 2");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
+       UpdateCalendarTest.AddAccount("Test Account 2", 2);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 3"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", DefaultColour, "Calendar Description 4"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", DefaultColour, "Calendar Description 5"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", DefaultColour, "Calendar Description 6"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -874,12 +935,12 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){
        CDSGetCalendarInfo calendar5Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test");
        CDSGetCalendarInfo calendar6Info = UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test");
        
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", DefaultColour, "Calendar Description 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", DefaultColour, "Calendar Description 3 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", DefaultColour, "Calendar Description 4 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated", DefaultColour, "Calendar Description 5 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated", DefaultColour, "Calendar Description 6 Updated"));
 
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName);
@@ -888,25 +949,32 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Two_Accounts){
        ASSERT_EQ("Calendar 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarName);
        ASSERT_EQ("Calendar 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarName);
 
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarDescription);
+
 }
 
 TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){
        
        CalendarDataStorage UpdateCalendarTest;
        
-       UpdateCalendarTest.AddAccount("Test Account 1");
-       UpdateCalendarTest.AddAccount("Test Account 2");
-       UpdateCalendarTest.AddAccount("Test Account 3");
+       UpdateCalendarTest.AddAccount("Test Account 1", 1);
+       UpdateCalendarTest.AddAccount("Test Account 2", 2);
+       UpdateCalendarTest.AddAccount("Test Account 3", 3);
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 7", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 8", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 9", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 2"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 3"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 4", "calendar1-test", DefaultColour, "Calendar Description 4"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 5", "calendar2-test", DefaultColour, "Calendar Description 5"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 2").accountID, "Calendar 6", "calendar3-test", DefaultColour, "Calendar Description 6"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 7", "calendar1-test", DefaultColour, "Calendar Description 7"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 8", "calendar2-test", DefaultColour, "Calendar Description 8"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.AddCalendar(UpdateCalendarTest.GetAccount("Test Account 3").accountID, "Calendar 9", "calendar3-test", DefaultColour, "Calendar Description 9"));
        
        CDSGetCalendarInfo calendar1Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test");
        CDSGetCalendarInfo calendar2Info = UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test");
@@ -918,15 +986,15 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){
        CDSGetCalendarInfo calendar8Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test");
        CDSGetCalendarInfo calendar9Info = UpdateCalendarTest.GetCalendar("Test Account 3", "calendar3-test");
 
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar7Info.calendarID, "Calendar 7 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar8Info.calendarID, "Calendar 8 Updated"));
-       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar9Info.calendarID, "Calendar 9 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar1Info.calendarID, "Calendar 1 Updated", DefaultColour, "Calendar Description 1 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar2Info.calendarID, "Calendar 2 Updated", DefaultColour, "Calendar Description 2 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar3Info.calendarID, "Calendar 3 Updated", DefaultColour, "Calendar Description 3 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar4Info.calendarID, "Calendar 4 Updated", DefaultColour, "Calendar Description 4 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar5Info.calendarID, "Calendar 5 Updated", DefaultColour, "Calendar Description 5 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar6Info.calendarID, "Calendar 6 Updated", DefaultColour, "Calendar Description 6 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar7Info.calendarID, "Calendar 7 Updated", DefaultColour, "Calendar Description 7 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar8Info.calendarID, "Calendar 8 Updated", DefaultColour, "Calendar Description 8 Updated"));
+       ASSERT_EQ(CDSCALENDAR_OK, UpdateCalendarTest.UpdateCalendar(calendar9Info.calendarID, "Calendar 9 Updated", DefaultColour, "Calendar Description 9 Updated"));
 
        ASSERT_EQ("Calendar 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarName);
        ASSERT_EQ("Calendar 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarName);
@@ -938,6 +1006,16 @@ TEST(CalendarDataStorage, Update_Three_Calendars_With_Three_Accounts){
        ASSERT_EQ("Calendar 8 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarName);
        ASSERT_EQ("Calendar 9 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar3-test").calendarName);
 
+       ASSERT_EQ("Calendar Description 1 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 2 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 3 Updated", UpdateCalendarTest.GetCalendar("Test Account 1", "calendar3-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 4 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 5 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 6 Updated", UpdateCalendarTest.GetCalendar("Test Account 2", "calendar3-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 7 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar1-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 8 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar2-test").calendarDescription);
+       ASSERT_EQ("Calendar Description 9 Updated", UpdateCalendarTest.GetCalendar("Test Account 3", "calendar3-test").calendarDescription);
+
 }
 
 TEST(CalendarDataStorage, Delete_One_Calendar){
@@ -945,9 +1023,9 @@ TEST(CalendarDataStorage, Delete_One_Calendar){
        CalendarDataStorage DeleteCalendarTest;
        int calendarID = 0;
        
-       DeleteCalendarTest.AddAccount("Test Account 1");
+       DeleteCalendarTest.AddAccount("Test Account 1", 1);
        
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
        
        calendarID = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID;
        
@@ -961,11 +1039,11 @@ TEST(CalendarDataStorage, Delete_Two_Calendars){
        int calendarID1 = 0;
        int calendarID2 = 0;
        
-       DeleteCalendarTest.AddAccount("Test Account 1");
-       DeleteCalendarTest.AddAccount("Test Account 2");        
+       DeleteCalendarTest.AddAccount("Test Account 1", 1);
+       DeleteCalendarTest.AddAccount("Test Account 2", 2);     
        
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 1"));
        
        calendarID1 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID;
        calendarID2 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID;
@@ -982,13 +1060,13 @@ TEST(CalendarDataStorage, Delete_Three_Calendars){
        int calendarID2 = 0;
        int calendarID3 = 0;    
        
-       DeleteCalendarTest.AddAccount("Test Account 1");
-       DeleteCalendarTest.AddAccount("Test Account 2");
-       DeleteCalendarTest.AddAccount("Test Account 3");
+       DeleteCalendarTest.AddAccount("Test Account 1", 1);
+       DeleteCalendarTest.AddAccount("Test Account 2", 2);
+       DeleteCalendarTest.AddAccount("Test Account 3", 3);
        
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour));
-       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 1"));
+       ASSERT_EQ(CDSCALENDAR_OK, DeleteCalendarTest.AddCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountID, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 1"));
        
        calendarID1 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar1-test").calendarID;
        calendarID2 = DeleteCalendarTest.GetCalendar(DeleteCalendarTest.GetAccount("Test Account 1").accountName, "calendar2-test").calendarID;
@@ -1004,8 +1082,8 @@ TEST(CalendarDataStorage, Add_One_Event){
        
        CalendarDataStorage AddEventTest;
        
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
@@ -1018,8 +1096,8 @@ TEST(CalendarDataStorage, Add_Two_Events){
        
        CalendarDataStorage AddEventTest;
        
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
@@ -1037,8 +1115,8 @@ TEST(CalendarDataStorage, Add_Three_Events){
        
        CalendarDataStorage AddEventTest;
        
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
@@ -1061,8 +1139,8 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information){
        
        CalendarDataStorage AddEventTest;       
 
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        
        // Get the entry information.
@@ -1091,8 +1169,8 @@ TEST(CalendarDataStorage, Add_One_Event_And_Get_Event_Basic_Information_With_Dur
        
        CalendarDataStorage AddEventTest;       
 
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEventResult = AddEventTest.AddEvent(1, "CalendarEvent2.ics");
        
        EXPECT_EQ(CDSENTRY_OK, addEventResult.addEventResult);
@@ -1128,8 +1206,8 @@ TEST(CalendarDataStorage, Add_Two_Events_And_Get_Event_Basic_Information){
        
        CalendarDataStorage AddEventTest;       
 
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent2.ics");
        
@@ -1184,8 +1262,8 @@ TEST(CalendarDataStorage, Add_The_Same_Three_Events_And_Get_Event_Information){
        
        CalendarDataStorage AddEventTest;
 
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
@@ -1255,8 +1333,8 @@ TEST(CalendarDataStorage, Add_Three_Events_And_Get_Event_Information){
        
        CalendarDataStorage AddEventTest;
 
-       AddEventTest.AddAccount("Test Account 1");
-       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       AddEventTest.AddAccount("Test Account 1", 1);
+       AddEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEvent1Result = AddEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = AddEventTest.AddEvent(1, "CalendarEvent2.ics");
        CDSAddEntryResult addEvent3Result = AddEventTest.AddEvent(1, "CalendarEvent3.ics");
@@ -1331,8 +1409,8 @@ TEST(CalendarDataStorage, Delete_One_Event){
        
        CalendarDataStorage DeleteEventTest;
 
-       DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteEventTest.AddAccount("Test Account 1", 1);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEventResult = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        
        EXPECT_EQ(CDSENTRY_OK, addEventResult.addEventResult);
@@ -1345,8 +1423,8 @@ TEST(CalendarDataStorage, Delete_Two_Events){
        
        CalendarDataStorage DeleteEventTest;
 
-       DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteEventTest.AddAccount("Test Account 1", 1);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics");
        
@@ -1362,8 +1440,8 @@ TEST(CalendarDataStorage, Delete_Three_Events){
        
        CalendarDataStorage DeleteEventTest;
 
-       DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteEventTest.AddAccount("Test Account 1", 1);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics");
        CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics");
@@ -1382,8 +1460,8 @@ TEST(CalendarDataStorage, Delete_One_Calendar_And_Events){
 
        CalendarDataStorage DeleteEventTest;
        
-       DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteEventTest.AddAccount("Test Account 1", 1);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
        CDSAddEntryResult addEvent1Result = DeleteEventTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteEventTest.AddEvent(1, "CalendarEvent2.ics");
        CDSAddEntryResult addEvent3Result = DeleteEventTest.AddEvent(1, "CalendarEvent3.ics");
@@ -1400,9 +1478,9 @@ TEST(CalendarDataStorage, Delete_Two_Calendars_And_Events){
 
        CalendarDataStorage DeleteEventTest;
        
-       DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar2-test", DefaultColour);
+       DeleteEventTest.AddAccount("Test Account 1", 1);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar2-test", DefaultColour, "Calendar Description 1");
 
        // Setup and delete the first calendar.
        
@@ -1434,10 +1512,10 @@ TEST(CalendarDataStorage, Delete_Three_Calendars_And_Events){
 
        CalendarDataStorage DeleteEventTest;
        
-       DeleteEventTest.AddAccount("Test Account 1");
-       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteEventTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
-       DeleteEventTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
+       DeleteEventTest.AddAccount("Test Account 1", 1);
+       DeleteEventTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteEventTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 1");
+       DeleteEventTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 1");
 
        // Setup and delete the first calendar.
        
@@ -1481,8 +1559,8 @@ TEST(CalendarDataStorage, Delete_One_Account_And_Associated_Data){
        
        CalendarDataStorage DeleteAccountTest;
        
-       DeleteAccountTest.AddAccount("Test Account 1");
-       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddAccount("Test Account 1", 1);
+       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
 
        // Setup and delete the first account.
        
@@ -1504,15 +1582,15 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
        
        CalendarDataStorage DeleteAccountTest;
        
-       DeleteAccountTest.AddAccount("Test Account 1");
-       DeleteAccountTest.AddAccount("Test Account 2");
-       DeleteAccountTest.AddAccount("Test Account 3");
+       DeleteAccountTest.AddAccount("Test Account 1", 1);
+       DeleteAccountTest.AddAccount("Test Account 2", 2);
+       DeleteAccountTest.AddAccount("Test Account 3", 3);
 
        // Setup and delete the first account.
        
-       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics");
@@ -1528,9 +1606,9 @@ TEST(CalendarDataStorage, Delete_Two_Accounts_And_Associated_Data){
 
        // Setup and delete the second account.
        
-       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        addEvent1Result = DeleteAccountTest.AddEvent(4, "CalendarEvent1.ics");
        addEvent2Result = DeleteAccountTest.AddEvent(4, "CalendarEvent2.ics");
@@ -1550,15 +1628,15 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
        
        CalendarDataStorage DeleteAccountTest;
        
-       DeleteAccountTest.AddAccount("Test Account 1");
-       DeleteAccountTest.AddAccount("Test Account 2");
-       DeleteAccountTest.AddAccount("Test Account 3");
+       DeleteAccountTest.AddAccount("Test Account 1", 1);
+       DeleteAccountTest.AddAccount("Test Account 2", 2);
+       DeleteAccountTest.AddAccount("Test Account 3", 3);
 
        // Setup and delete the first account.
        
-       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        CDSAddEntryResult addEvent1Result = DeleteAccountTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = DeleteAccountTest.AddEvent(1, "CalendarEvent2.ics");
@@ -1574,9 +1652,9 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 
        // Setup and delete the second account.
        
-       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(2, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(2, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(2, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        addEvent1Result = DeleteAccountTest.AddEvent(4, "CalendarEvent1.ics");
        addEvent2Result = DeleteAccountTest.AddEvent(4, "CalendarEvent2.ics");
@@ -1592,9 +1670,9 @@ TEST(CalendarDataStorage, Delete_Three_Accounts_And_Associated_Data){
 
        // Setup and delete the third account.
        
-       DeleteAccountTest.AddCalendar(3, "Calendar 1", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(3, "Calendar 2", "calendar1-test", DefaultColour);
-       DeleteAccountTest.AddCalendar(3, "Calendar 3", "calendar1-test", DefaultColour);
+       DeleteAccountTest.AddCalendar(3, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(3, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       DeleteAccountTest.AddCalendar(3, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        addEvent1Result = DeleteAccountTest.AddEvent(7, "CalendarEvent1.ics");
        addEvent2Result = DeleteAccountTest.AddEvent(7, "CalendarEvent2.ics");
@@ -1614,13 +1692,13 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_One_Account){
 
        CalendarDataStorage GetEventsListTest;
        
-       GetEventsListTest.AddAccount("Test Account 1");
+       GetEventsListTest.AddAccount("Test Account 1", 1);
 
        // Setup and delete the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        CDSAddEntryResult addEvent1Result = GetEventsListTest.AddEvent(1, "CalendarEvent1.ics");
        CDSAddEntryResult addEvent2Result = GetEventsListTest.AddEvent(1, "CalendarEvent2.ics");
@@ -1638,13 +1716,13 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Two_Accounts){
 
        CalendarDataStorage GetEventsListTest;
        
-       GetEventsListTest.AddAccount("Test Account 1");
+       GetEventsListTest.AddAccount("Test Account 1", 1);
 
        // Setup and delete the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        // Setup the first account.
        
@@ -1676,13 +1754,13 @@ TEST(CalendarDataStorage, Get_List_Of_Events_For_Three_Accounts){
 
        CalendarDataStorage GetEventsListTest;
        
-       GetEventsListTest.AddAccount("Test Account 1");
+       GetEventsListTest.AddAccount("Test Account 1", 1);
 
        // Setup and delete the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar1-test", DefaultColour, "Calendar Description 1");
        
        // Setup the first account.
        
@@ -1726,13 +1804,13 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_One_Account){
        
        CalendarDataStorage GetEventsListTest;
        
-       GetEventsListTest.AddAccount("Test Account 1");
+       GetEventsListTest.AddAccount("Test Account 1", 1);
        
        // Setup the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 1");
        
        // Get the list of calendar IDs.
        
@@ -1752,14 +1830,14 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){
        
        CalendarDataStorage GetEventsListTest;
        
-       GetEventsListTest.AddAccount("Test Account 1");
-       GetEventsListTest.AddAccount("Test Account 2");
+       GetEventsListTest.AddAccount("Test Account 1", 1);
+       GetEventsListTest.AddAccount("Test Account 2", 2);
        
        // Setup the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 1");
        
        // Get the list of calendar IDs.
        
@@ -1775,9 +1853,9 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Two_Accounts){
        
        // Setup the second account.
        
-       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test", DefaultColour);
-       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", DefaultColour);
-       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", DefaultColour);
+       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", DefaultColour, "Calendar Description 1");
 
        calendarList = GetEventsListTest.GetCalendarList(2);
 
@@ -1795,15 +1873,15 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
        
        CalendarDataStorage GetEventsListTest;
        
-       GetEventsListTest.AddAccount("Test Account 1");
-       GetEventsListTest.AddAccount("Test Account 2");
-       GetEventsListTest.AddAccount("Test Account 3");
+       GetEventsListTest.AddAccount("Test Account 1", 1);
+       GetEventsListTest.AddAccount("Test Account 2", 2);
+       GetEventsListTest.AddAccount("Test Account 3", 3);
        
        // Setup the first account.
        
-       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour);
-       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour);
+       GetEventsListTest.AddCalendar(1, "Calendar 1", "calendar1-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 2", "calendar2-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(1, "Calendar 3", "calendar3-test", DefaultColour, "Calendar Description 1");
        
        // Get the list of calendar IDs.
        
@@ -1819,9 +1897,9 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
        
        // Setup the second account.
        
-       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test", DefaultColour);
-       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", DefaultColour);
-       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", DefaultColour);
+       GetEventsListTest.AddCalendar(2, "Calendar 4", "calendar4-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(2, "Calendar 5", "calendar5-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(2, "Calendar 6", "calendar6-test", DefaultColour, "Calendar Description 1");
 
        calendarList = GetEventsListTest.GetCalendarList(2);
 
@@ -1835,9 +1913,9 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
 
        // Setup the third account.
        
-       GetEventsListTest.AddCalendar(3, "Calendar 7", "calendar7-test", DefaultColour);
-       GetEventsListTest.AddCalendar(3, "Calendar 8", "calendar8-test", DefaultColour);
-       GetEventsListTest.AddCalendar(3, "Calendar 9", "calendar9-test", DefaultColour);
+       GetEventsListTest.AddCalendar(3, "Calendar 7", "calendar7-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(3, "Calendar 8", "calendar8-test", DefaultColour, "Calendar Description 1");
+       GetEventsListTest.AddCalendar(3, "Calendar 9", "calendar9-test", DefaultColour, "Calendar Description 1");
 
        calendarList = GetEventsListTest.GetCalendarList(3);
 
@@ -1849,4 +1927,212 @@ TEST(CalendarDataStorage, Get_List_Of_Calendars_For_Three_Accounts){
        EXPECT_EQ("calendar8-test", calendarList.calendarListTextID.at(1));
        EXPECT_EQ("calendar9-test", calendarList.calendarListTextID.at(2));
 
+}
+
+TEST(CalendarDataStorage, Add_One_Checksum){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       
+       // Get the checksum.
+       
+       //EXPECT_EQ("checksumYay", ChecksumTest.GetChecksum("firstChecksum"));
+       
+}
+
+TEST(CalendarDataStorage, Add_Two_Checksus){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("secondChecksum", "checksumTwo"));
+       
+}
+
+TEST(CalendarDataStorage, Add_Three_Checksus){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("secondChecksum", "checksumTwo"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("thirdChecksum", "checksumThree"));
+       
+}
+
+TEST(CalendarDataStorage, Add_One_Checksum_And_Get_One_Checksum){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       
+       // Get the checksum.
+       
+       CDSGetChecksumResult getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumYay", getChecksumResult.checksumValue);
+       
+}
+
+TEST(CalendarDataStorage, Add_Two_Checksums_And_Get_Two_Checksums){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("secondChecksum", "checksumTwo"));
+       
+       // Get the checksums.
+       
+       CDSGetChecksumResult getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumYay", getChecksumResult.checksumValue);
+
+       getChecksumResult = ChecksumTest.GetChecksum("secondChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue);
+       
+}
+
+TEST(CalendarDataStorage, Add_Three_Checksums_And_Get_Three_Checksums){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("secondChecksum", "checksumTwo"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("thirdChecksum", "checksumThree"));
+       
+       // Get the checksums.
+       
+       CDSGetChecksumResult getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumYay", getChecksumResult.checksumValue);
+
+       getChecksumResult = ChecksumTest.GetChecksum("secondChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue);
+
+       getChecksumResult = ChecksumTest.GetChecksum("thirdChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumThree", getChecksumResult.checksumValue);
+       
+}
+
+TEST(CalendarDataStorage, Add_One_Checksum_Update_One_Checksum_And_Get_One_Checksum){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       
+       // Get the checksum.
+       
+       CDSGetChecksumResult getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumYay", getChecksumResult.checksumValue);
+       
+       // Update the checksum.
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.UpdateChecksum("firstChecksum", "updatedChecksum1"));
+       
+       // Get the checksum again.
+       
+       getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("updatedChecksum1", getChecksumResult.checksumValue); 
+       
+}
+
+TEST(CalendarDataStorage, Add_Two_Checksums_Update_Two_Checksums_And_Get_Two_Checksums){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("secondChecksum", "checksumTwo"));
+       
+       // Get the checksum.
+       
+       CDSGetChecksumResult getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumYay", getChecksumResult.checksumValue);
+
+       getChecksumResult = ChecksumTest.GetChecksum("secondChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue);
+       
+       // Update the checksum.
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.UpdateChecksum("firstChecksum", "updatedChecksum1"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.UpdateChecksum("secondChecksum", "updatedChecksum2"));
+       
+       // Get the checksum again.
+       
+       getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("updatedChecksum1", getChecksumResult.checksumValue); 
+       
+       getChecksumResult = ChecksumTest.GetChecksum("secondChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult);
+       EXPECT_EQ("updatedChecksum2", getChecksumResult.checksumValue); 
+       
+}
+
+TEST(CalendarDataStorage, Add_Three_Checksums_Update_Three_Checksums_And_Get_Three_Checksums){
+       
+       CalendarDataStorage ChecksumTest;
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("firstChecksum", "checksumYay"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("secondChecksum", "checksumTwo"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.AddChecksum("thirdChecksum", "checksumThree"));
+       
+       // Get the checksum.
+       
+       CDSGetChecksumResult getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumYay", getChecksumResult.checksumValue);
+
+       getChecksumResult = ChecksumTest.GetChecksum("secondChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumTwo", getChecksumResult.checksumValue);
+
+       getChecksumResult = ChecksumTest.GetChecksum("thirdChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("checksumThree", getChecksumResult.checksumValue);
+       
+       // Update the checksum.
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.UpdateChecksum("firstChecksum", "updatedChecksum1"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.UpdateChecksum("secondChecksum", "updatedChecksum2"));
+       EXPECT_EQ(CDSCHECKSUM_OK, ChecksumTest.UpdateChecksum("thirdChecksum", "updatedChecksum3"));
+       
+       // Get the checksum again.
+       
+       getChecksumResult = ChecksumTest.GetChecksum("firstChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult); 
+       EXPECT_EQ("updatedChecksum1", getChecksumResult.checksumValue); 
+       
+       getChecksumResult = ChecksumTest.GetChecksum("secondChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult);
+       EXPECT_EQ("updatedChecksum2", getChecksumResult.checksumValue); 
+
+       getChecksumResult = ChecksumTest.GetChecksum("thirdChecksum");
+       
+       EXPECT_EQ(CDSCHECKSUM_OK, getChecksumResult.getChecksumResult);
+       EXPECT_EQ("updatedChecksum3", getChecksumResult.checksumValue); 
+
 }
\ No newline at end of file