Rename methods again. Add in spec covering deferrable functionality