Fixed unit tests for previous commit

Change-Id: Ib35709594a859400bb9cc621fefd93f86fc349c6