Converted some more core assertion to use expect internally