Small fixes

Change-Id: I5cddf6564b6c6ca9f5c3364ce32d0fdee5abeff3
Fixed unit tests

Change-Id: I101cb07515af6354e6d44c2efad46a42dfc1fdbe