Fixed trailing commas in unit tests. Fixed IP address lookup for NAT'd
remote pollers.