AssertUtil improvements