Fix test failures caused by previous commit

Change-Id: I66b6c5e8f9cd88e79db1f96a453ecf2ee8280226
Signed-off-by: Lorand Jakab <lojakab@cisco.com>