Refactored Server unit tests