Reverted test conditions
Fixed self suppression