Make assertions more abstract