Refactor spec to be less brittle (for address)