fixed the remaining assertions that currently throw erros