Fix tests from #948