Refactor Address Finder e2e tests