Ensure addresses can both set and generate addresses

Ensure addresses can both set and generate addresses #132