improved server tests