Merge "Add unit tests for show_server and list_servers"