Better session handling in tests.
More session cleanup.
session cleanup in tests
session cleanup in tests