Unit tests fixed

Change-Id: I745f2253825eb07cdb05b0e1e6706d5071cfbe7e