Refactor all assertions