Regression: Fix broken tests

Not sure how these past jenkins!

Change-Id: I8efc1de415f3ec5754c654b0c615af5a029b4e66