IPResolver moved to a separate class, also new tests were introduced to cover it.