added updated UML diagram, and made the server tests look nicer, no functional changes