Merge "Added server details tests. Also re-added several files that somehow missed the initial commit"