Refactor to map all assert functions