Harden test - revert PR