improved address printing and fixed tests