Fixes #991. (cherry picked from commit 138c7161be) Change-Id: Iafc7d9603fbc3615393d32d9630f0e8fe548950b
138c7161be
This change feels kind of gross and reveals a fair bit about the disorganization of our tests, but I think it makes parts of it a bit better. Change-Id: Idb8d9a00cbd75d5c156678c6b408b42b59d5e4d7