Improvements in tests, but oddness around stateless sessions