Better guard supply tests against hangs