WIP - Fixing unit tests

Change-Id: Icc7ba6e6414b2dce8ad3aecd171009b8fbb37425