0d02b1d51c
These tests were falling due to inserted diagnostics. New test infrastructure can remove them before running test.