Make the two failing tests pass

Change-Id: I881152dc0f90a578ddc2cf4dc95f80497886adf2
Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>