More changes to test_session