Fixed server tests