This should make potential functional test failures more clear. Change-Id: Iac67dbcc90459eb0455114a520a7e8ea0bb504b2