more server tests, fix