Added seprate iphost and ipnetwork params; updated tests;