Refactored server tests again.