Several more cookie tests
Merge branch 'bessarabov-more_cookie_tests'