Init non proxy hosts

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Fix UT

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>