fixes in addr part2; also testing tables