Update spec and add spec helpers