AssertUtil refactored