changes from test-session