Small fix in test_attachstream and test_mapaddress

Continuing to address ticket #8692.