Adjust some assertions