added some tests for server.rb
resolved merge conflicts