Simplifies the unit test for #8082.