rearrange spec helpers a bit