diff --git a/3.Integration Test Plan Document/ITPD.lyx b/3.Integration Test Plan Document/ITPD.lyx
index 0341e04..6b685a0 100644
--- a/3.Integration Test Plan Document/ITPD.lyx	
+++ b/3.Integration Test Plan Document/ITPD.lyx	
@@ -1809,7 +1809,7 @@ Authentication Manager
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -1830,12 +1830,12 @@ register(Credentials)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -1846,11 +1846,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This function creates a new entity user in the system with all the information
+This function creates a new User object in the system with all the information
  provided by the user.
 \end_layout
 
@@ -1864,7 +1864,7 @@ This function creates a new entity user in the system with all the information
 \begin_layout Plain Layout
 
 \shape slanted
-Input 
+Input Specification
 \end_layout
 
 \end_inset
@@ -1882,126 +1882,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-A Credential object (name, surname, username, password, address..)
-\end_layout
-
-\end_inset
-</cell>
-<cell mroffset="0.5pt" alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-The user data are correctly inserted in the database.
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace smallskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
-<column alignment="center" valignment="top" width="0pt">
-<row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\family typewriter
-userExists(User) 
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
-<features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
-<row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\series bold
-Description
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-This is a cool description
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topspace="1pt" bottomspace="1pt">
-<cell alignment="left" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape slanted
-Input
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape slanted
-Effect
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2010,13 +1891,33 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An incomplete / duplicate set of information about the new user
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2025,7 +1926,8 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+A full set of information about the new user (username, password, name,
+ surname, ...)
 \end_layout
 
 \end_inset
@@ -2034,7 +1936,8 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The unique user data are correctly inserted in the database.
+ 
 \end_layout
 
 \end_inset
@@ -2055,6 +1958,9 @@ The user data are correctly inserted in the database.
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
 \begin_inset VSpace smallskip
 \end_inset
 
@@ -2065,7 +1971,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2086,12 +1992,12 @@ login(Credentials)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2102,11 +2008,12 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function allows any registered user to log into the system using his
+ username and password.
 \end_layout
 
 \end_inset
@@ -2119,7 +2026,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2137,7 +2044,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2146,13 +2053,33 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2161,7 +2088,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An existent and valid Credentials object
 \end_layout
 
 \end_inset
@@ -2170,7 +2097,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The user is logged in.
 \end_layout
 
 \end_inset
@@ -2201,7 +2128,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2222,12 +2149,12 @@ checkCredentials(Credentials)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2238,11 +2165,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function verifies the user - password combination is correct.
 \end_layout
 
 \end_inset
@@ -2255,7 +2182,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2273,7 +2200,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2282,13 +2209,33 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2297,7 +2244,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An existent and valid Credentials object
 \end_layout
 
 \end_inset
@@ -2306,7 +2253,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+Returns true.
 \end_layout
 
 \end_inset
@@ -2349,7 +2296,7 @@ AccountInformation Manager
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2370,12 +2317,12 @@ removeUser(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2386,11 +2333,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function deletes the User object from the system.
 \end_layout
 
 \end_inset
@@ -2403,7 +2350,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2421,7 +2368,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2430,13 +2377,33 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2445,7 +2412,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An existent and valid User object
 \end_layout
 
 \end_inset
@@ -2454,7 +2421,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The User object is correctly removed.
 \end_layout
 
 \end_inset
@@ -2488,7 +2455,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2509,12 +2476,12 @@ activate(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="6" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2525,11 +2492,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function restores the privileges of the User object.
 \end_layout
 
 \end_inset
@@ -2542,7 +2509,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2560,7 +2527,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2569,13 +2536,53 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An Active User object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2584,7 +2591,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+A Deactivated User object
 \end_layout
 
 \end_inset
@@ -2593,7 +2600,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The User object is no more a Deactivated User.
 \end_layout
 
 \end_inset
@@ -2614,6 +2621,10 @@ The user data are correctly inserted in the database.
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\align center
 \begin_inset VSpace smallskip
 \end_inset
 
@@ -2624,7 +2635,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2633,7 +2644,7 @@ The user data are correctly inserted in the database.
 \begin_layout Plain Layout
 
 \family typewriter
-deactivate(User) 
+deactivate(User)
 \end_layout
 
 \end_inset
@@ -2645,12 +2656,12 @@ deactivate(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="6" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2661,11 +2672,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function removes privileges from the User object.
 \end_layout
 
 \end_inset
@@ -2678,7 +2689,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2696,7 +2707,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2705,13 +2716,53 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+A Deactivated User object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2720,7 +2771,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An Active User object
 \end_layout
 
 \end_inset
@@ -2729,7 +2780,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The User object is no more an Active User.
 \end_layout
 
 \end_inset
@@ -2760,7 +2811,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2769,7 +2820,7 @@ The user data are correctly inserted in the database.
 \begin_layout Plain Layout
 
 \family typewriter
-editProfile(User)
+editProfile(User, Credentials)
 \end_layout
 
 \end_inset
@@ -2781,12 +2832,12 @@ editProfile(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="6" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2797,11 +2848,12 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function updates the existent User object in the system with all the
+ new information provided by the Credentials object.
 \end_layout
 
 \end_inset
@@ -2814,7 +2866,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2832,7 +2884,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2841,13 +2893,53 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An incomplete set of information
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -2856,7 +2948,8 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+A full set of information about the User object (username, password, name,
+ surname, ...)
 \end_layout
 
 \end_inset
@@ -2865,7 +2958,8 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The User data is correctly updated in the database.
+ 
 \end_layout
 
 \end_inset
@@ -2896,7 +2990,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -2905,7 +2999,7 @@ The user data are correctly inserted in the database.
 \begin_layout Plain Layout
 
 \family typewriter
-getHistory(User) 
+getHistory(User)
 \end_layout
 
 \end_inset
@@ -2917,12 +3011,12 @@ getHistory(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2933,11 +3027,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function returns all the User reservations.
 \end_layout
 
 \end_inset
@@ -2950,7 +3044,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -2968,7 +3062,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2977,7 +3071,7 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -2988,119 +3082,20 @@ A NullArgumentException is raised.
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An invalid object
 \end_layout
 
 \end_inset
 </cell>
-<cell mroffset="0.5pt" alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace smallskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
-<column alignment="center" valignment="top" width="0pt">
-<row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\family typewriter
-updateUser(user) 
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
-<features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
-<row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\series bold
-Description
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-This is a cool description
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topspace="1pt" bottomspace="1pt">
-<cell alignment="left" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape slanted
-Input
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape slanted
-Effect
+An InvalidArgumentException is raised.
 \end_layout
 
 \end_inset
@@ -3111,27 +3106,7 @@ Effect
 \begin_inset Text
 
 \begin_layout Plain Layout
-A null parameter
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-A NullArgumentException is raised.
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-A non-null user
+An existent and valid User object
 \end_layout
 
 \end_inset
@@ -3140,7 +3115,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+A list of all the reservations is returned.
 \end_layout
 
 \end_inset
@@ -3161,6 +3136,10 @@ The user data are correctly inserted in the database.
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
+\align center
 \begin_inset VSpace smallskip
 \end_inset
 
@@ -3171,7 +3150,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -3192,12 +3171,12 @@ enableMSO(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -3208,11 +3187,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function enables the Money Saving Option for the User.
 \end_layout
 
 \end_inset
@@ -3225,7 +3204,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -3243,7 +3222,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -3252,13 +3231,33 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -3267,7 +3266,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An existent and valid User object
 \end_layout
 
 \end_inset
@@ -3276,7 +3275,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The User object has the MSO enabled.
 \end_layout
 
 \end_inset
@@ -3307,7 +3306,7 @@ The user data are correctly inserted in the database.
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="2" columns="1">
-<features tabularvalignment="middle" tabularwidth="50page%">
+<features tabularvalignment="middle" tabularwidth="70page%">
 <column alignment="center" valignment="top" width="0pt">
 <row topspace="1pt" bottomspace="1pt">
 <cell alignment="center" valignment="top" topline="true" bottomline="true" usebox="none">
@@ -3328,12 +3327,12 @@ disableMSO(User)
 
 \begin_layout Plain Layout
 \begin_inset Tabular
-<lyxtabular version="3" rows="4" columns="2">
+<lyxtabular version="3" rows="5" columns="2">
 <features tabularvalignment="middle">
-<column alignment="left" valignment="top">
-<column alignment="left" valignment="top" width="44col%">
+<column alignment="left" valignment="middle" width="36col%">
+<column alignment="left" valignment="top" width="50col%">
 <row topspace="1pt" bottomspace="1pt">
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell multirow="3" alignment="left" valignment="middle" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -3344,11 +3343,11 @@ Description
 
 \end_inset
 </cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+<cell alignment="left" valignment="top" bottomline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
-This is a cool description
+This function disables the Money Saving Option for the User.
 \end_layout
 
 \end_inset
@@ -3361,7 +3360,7 @@ This is a cool description
 \begin_layout Plain Layout
 
 \shape slanted
-Input
+Input Specification
 \end_layout
 
 \end_inset
@@ -3379,7 +3378,7 @@ Effect
 </cell>
 </row>
 <row topspace="1pt" bottomspace="2pt">
-<cell alignment="left" valignment="top" usebox="none">
+<cell alignment="center" valignment="top" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
@@ -3388,13 +3387,33 @@ A null parameter
 
 \end_inset
 </cell>
-<cell alignment="left" valignment="top" leftline="true" usebox="none">
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
 \begin_inset Text
 
 \begin_layout Plain Layout
 A NullArgumentException is raised.
 \end_layout
 
+\end_inset
+</cell>
+</row>
+<row topspace="1pt" bottomspace="2pt">
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An invalid object
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+An InvalidArgumentException is raised.
+\end_layout
+
 \end_inset
 </cell>
 </row>
@@ -3403,7 +3422,7 @@ A NullArgumentException is raised.
 \begin_inset Text
 
 \begin_layout Plain Layout
-A non-null user
+An existent and valid User object
 \end_layout
 
 \end_inset
@@ -3412,7 +3431,7 @@ A non-null user
 \begin_inset Text
 
 \begin_layout Plain Layout
-The user data are correctly inserted in the database.
+The User object has the MSO disabled.
 \end_layout
 
 \end_inset