#3 Some refactoring and added tests for simple addresses (streetname and housenumber)