Enhance the assertions