Fix two more build breakers when a test fails.