Bug 584 - Milestone : Increasing unit test coverage, from 44.9% to 60%

Change-Id: I4bab0d83892c15fa198d72e99c262ee2011d9830
Signed-off-by: Peter Bandzi <pbandzi@cisco.com>
Merge "Bug 584 - Milestone : Increasing unit test coverage, from 44.9% to 60%"