Test suite - try to make addip test more reliable and add some debugging.