Renamed ServerFactory to Server.
Refactored responsibilities in tests.