Fixed review comments and added rspec tests for get_server