Another bunch of fixes + Added new unit tests to test out new addServer functionality