Few additions and fixes to server tests