Refactored code
Move Server Test cases