Change test to only have one 'done' call
Revert server configuration
Merge remote-tracking branch 'origin/master'