Finished new assert handlers