Updated more assertions.