session server tests
renamings