Fixed up address parsers and added unit tests