Improve server test coverage