Fixing tests

Change-Id: I780dacc96b8bd76cf90c91e1764ba5d5d4a25927