More unit testing.  Removing cookies until we have a proper mock in place.