Minor style cleanup.
Update cookie test.