small fixes for server tests