Summary: amended test to be more robust to set of potential exceptions thrown Reviewed-by: chegar, khazra
Summary: Add .local to derived effective hostnames without dot Reviewed-by: chegar
