Fixed the Validate to account for a possible NPE. Fixed the setup command to order servers properly and added relevant tests.