Minor tweaks to get assertion working