rpearce/grichards: Fix up tests