Updated code to fix issues

  * Updated to make it log correctly
  * Fixed issue with checking/validation
Updated code to make it more moduler

 * Changed some attribute names to make them more convential
 * Added new attributes for server info, and partner info
 * Added a first test
Updated tests to make them pass