Tidy up spec helpers