regex tweak
add tests for tokenizing address strings