Use proper assertion handlers