reorganize address tests #50