Improve server test