more work on getting cookie based unit tests working