Added tests, updated default hostname, upped server count