Improve UTs

Change-Id: I32c55b476aef34a82267a01bc53219a2f971180e
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
7 files changed