added more assertions