cleaned up addresolver, and added a couple more tests