Corrected bugs found during unit and integration testing

Change-Id: Ied98adbc364f7bdd16c38e019abfee05c18afdef
Signed-off-by: lloretgalleg <illoret@indra.es>
3 files changed