Merge "Harden manage negative tests"