Add couple more assertions