This looks like it should work, but does not

Change-Id: I65f853931871278ed564fe092523eaa926b615f0
This runs tests properly, but it's not going to tell you

Change-Id: I418d92aa3ba7308f56002ded6c1d9d6b82dd7621