Fixed failing tests

Change-Id: Ie746b625312ced6ca333f564e1c116bf97319884