Updated tests and small refactor
Merge branch 'master' of https://github.com/moltin/address