Add spec helpers and update spec using them.