Updated comment tests to reduce flake