Add test for issue #872
Fix #872 (macro expansion in multiple blocks)