make cookies and tests working with new PSL