Server tests refactored.
Server tests updated and passing.