Expand cookie test coverage, squash a bug in the process
Done