changed hostname resolve section + updated unit tests