A kindler, gentler death re: Robby
Fix cookie test re version